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

@ -315,6 +315,7 @@
<column name="modifier" phpName="DbModifier" type="VARCHAR" size="16" required="true"/>
<column name="value" phpName="DbValue" type="VARCHAR" size="512" required="true"/>
<column name="extra" phpName="DbExtra" type="VARCHAR" size="512" required="false"/>
<column name="criteriagroup" phpName="DbCriteriaGroup" type="INTEGER" required="false"/>
<column name="block_id" phpName="DbBlockId" type="INTEGER" required="true"/>
<foreign-key foreignTable="cc_block" name="cc_blockcontents_block_id_fkey" onDelete="CASCADE">
<reference local="block_id" foreign="id"/>