diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml index 48e492c3095e970d96e5b10aa85388c02aba5ffd..b019361b8f821aaf76df0c2dff28e3db03056fe0 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_alarm_list.xml @@ -23,6 +23,12 @@ <key> <string>_data</string> </key> <value> <dictionary> + <item> + <key> <string>getAlarmDate</string> </key> + <value> + <dictionary/> + </value> + </item> <item> <key> <string>uid</string> </key> <value> @@ -37,6 +43,7 @@ <value> <list> <string>uid</string> + <string>getAlarmDate</string> </list> </value> </item> @@ -53,7 +60,8 @@ </item> <item> <key> <string>arguments_src</string> </key> - <value> <string>uid</string> </value> + <value> <string>uid\r\n +getAlarmDate</string> </value> </item> <item> <key> <string>cache_time_</string> </key> @@ -94,11 +102,12 @@ <value> <string encoding="cdata"><![CDATA[ REPLACE INTO\n - alarm (uid)\n + alarm (uid, alarm_date)\n VALUES\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n (\n - <dtml-sqlvar expr="uid[loop_item]" type="int">\n + <dtml-sqlvar expr="uid[loop_item]" type="int">,\n + <dtml-sqlvar expr="getAlarmDate[loop_item]" type="datetime" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n @@ -143,11 +152,12 @@ VALUES\n <value> <string encoding="cdata"><![CDATA[ REPLACE INTO\n - alarm (uid)\n + alarm (uid, alarm_date)\n VALUES\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n (\n - <dtml-sqlvar expr="uid[loop_item]" type="int">\n + <dtml-sqlvar expr="uid[loop_item]" type="int">,\n + <dtml-sqlvar expr="getAlarmDate[loop_item]" type="datetime" optional>\n )\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n </dtml-in>\n diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml index 85e0d1fb466f7afca782f448d376cb00425aeecc..93c25de0705e27bdd1031ad8d97b26cc9476fd10 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_alarm.xml @@ -94,7 +94,7 @@ #\n CREATE TABLE `alarm` (\n `uid` BIGINT UNSIGNED NOT NULL,\n - `alarm_date` datetime default \'2006-01-01\',\n + `alarm_date` DATETIME,\n PRIMARY KEY (`uid`)\n ) TYPE=InnoDB;\n </string> </value> @@ -139,7 +139,7 @@ CREATE TABLE `alarm` (\n #\n CREATE TABLE `alarm` (\n `uid` BIGINT UNSIGNED NOT NULL,\n - `alarm_date` datetime default \'2006-01-01\',\n + `alarm_date` DATETIME,\n PRIMARY KEY (`uid`)\n ) TYPE=InnoDB;\n </string> </value> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index 83248fb9df4a244c41a10fa536045d5a8e759aee..aa59885c836ad82e8a621dbdde0bf9fb7a80c346 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -142 \ No newline at end of file +143 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_local_role_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_local_role_list new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_portal_type_role_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_portal_type_role_list new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_registered_skin_selection_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_registered_skin_selection_list new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391