erp5_mysql_innodb_catalog: add local roles group id

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_roles_and_users_list.xml

@@ -57,15 +57,15 @@
 <dtml-let row_list="[]">\n
   <dtml-in prefix="loop" expr="_.range(_.len(optimised_roles_and_users))">\n
     <dtml-in prefix="role" expr="optimised_roles_and_users[loop_item]">\n
-      <dtml-call expr="row_list.append([role_item[0], role_item[2]])">\n
+      <dtml-call expr="row_list.append([role_item[0], role_item[1], role_item[2]])">\n
     </dtml-in>\n
   </dtml-in>\n
   <dtml-if expr="row_list">\n
 INSERT INTO\n
-  roles_and_users(uid, allowedRolesAndUsers)\n
+  roles_and_users(uid, local_roles_group_id, allowedRolesAndUsers)\n
 VALUES\n
     <dtml-in prefix="row" expr="row_list">\n
-(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">)\n
+(<dtml-sqlvar expr="row_item[0]" type="string">, <dtml-sqlvar expr="row_item[1]" type="string">, <dtml-sqlvar expr="row_item[2]" type="string">)\n
 <dtml-if sequence-end><dtml-else>,</dtml-if>\n
     </dtml-in>\n
   </dtml-if>\n

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_roles_and_users.xml

@@ -60,9 +60,11 @@
             <key> <string>src</string> </key>
             <value> <string>CREATE TABLE roles_and_users (\n
   uid INT UNSIGNED,\n
+  local_roles_group_id VARCHAR(255) default \'\',\n
   allowedRolesAndUsers VARCHAR(255),\n
   KEY `uid` (`uid`),\n
-  KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`)\n
+  KEY `allowedRolesAndUsers` (`allowedRolesAndUsers`),\n
+  KEY `local_roles_group_id` (`local_roles_group_id`)\n
 )  ENGINE=InnoDB;\n
 </string> </value>
         </item>

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_security.xml

@@ -53,7 +53,7 @@
             <value> <string encoding="cdata"><![CDATA[
 
 SELECT\n
-  DISTINCT uid\n
+  DISTINCT uid, local_roles_group_id\n
 FROM \n
   roles_and_users\n
 WHERE \n