Merge pull request #704 from Robbt/fix-smartblock-multi-criteria

Fix smartblock multi criteria
This commit is contained in:
Robb 2019-02-09 11:22:29 -05:00 committed by GitHub
commit a4d0fcd8f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 857 additions and 220 deletions

View file

@ -44,6 +44,7 @@ class CcBlockcriteriaTableMap extends TableMap
$this->addColumn('modifier', 'DbModifier', 'VARCHAR', true, 16, null);
$this->addColumn('value', 'DbValue', 'VARCHAR', true, 512, null);
$this->addColumn('extra', 'DbExtra', 'VARCHAR', false, 512, null);
$this->addColumn('criteriagroup', 'DbCriteriaGroup', 'INTEGER', false, null, null);
$this->addForeignKey('block_id', 'DbBlockId', 'INTEGER', 'cc_block', 'id', true, null, null);
// validators
} // initialize()