diff options
| author | michael pereira | 2011-03-05 13:27:20 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-05 13:27:20 +0100 |
| commit | 3e86f2118ae8fd85e433913410c82915232cd073 (patch) | |
| tree | 3fbb90e62a1974cc9daf94d58a79f06ae449e0fd /application/models/DbTable | |
| parent | bootos v1 (diff) | |
| parent | Oberfläche der filter wurde verbessert, sodass nun filterentrys angelegt wer... (diff) | |
| download | pbs2-3e86f2118ae8fd85e433913410c82915232cd073.tar.gz pbs2-3e86f2118ae8fd85e433913410c82915232cd073.tar.xz pbs2-3e86f2118ae8fd85e433913410c82915232cd073.zip | |
.zfproject fix
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Conflicts:
.zfproject.xml
Diffstat (limited to 'application/models/DbTable')
| -rw-r--r-- | application/models/DbTable/FilterEntries.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/models/DbTable/FilterEntries.php b/application/models/DbTable/FilterEntries.php index f0f976d..309858d 100644 --- a/application/models/DbTable/FilterEntries.php +++ b/application/models/DbTable/FilterEntries.php @@ -4,7 +4,7 @@ class Application_Model_DbTable_FilterEntries extends Zend_Db_Table_Abstract { protected $_name = 'pbs_filterentries'; - + protected $_primary = array('filterID','filtertypeID'); } |