Переглянути джерело

updated reinstall ant object, fixed CRM_PROCES schema

Piotr Labudda 8 роки тому
батько
коміт
8d15f669d1

+ 6 - 6
SE/schema/ant-object/default_db.CRM_PROCES/PROCES/PROCES.xsd

@@ -657,7 +657,7 @@
                      </xsd:documentation>
                   </xsd:annotation>
                </xsd:element>
-               <xsd:element maxOccurs="0"
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
                            id="_CRM_PROCES___d4e4937-1">
@@ -671,8 +671,8 @@
                      <xsd:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                      </xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
-               <xsd:element maxOccurs="0"
+               </xsd:element> -->
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_1"
                            id="_CRM_PROCES___d4e4944-1">
@@ -686,8 +686,8 @@
                      <xsd:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                      </xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
-               <xsd:element maxOccurs="0"
+               </xsd:element> -->
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_2"
                            id="_CRM_PROCES___d4e4951-1">
@@ -701,7 +701,7 @@
                      <xsd:documentation>xpath="default_db__x3A__CRM_PROCES:PROCES_INIT/PARENT_ID
                      </xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
+               </xsd:element> -->
                <xsd:element maxOccurs="1"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO"

+ 6 - 6
SE/schema/ant-object/default_db.CRM_PROCES/PROCES_INIT/PROCES_INIT.xsd

@@ -301,7 +301,7 @@
                      <xsd:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xsd:documentation>
                   </xsd:annotation>
                </xsd:element>
-               <xsd:element maxOccurs="0"
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_INIT"
                            id="_CRM_PROCES___d4e4769-1">
@@ -314,8 +314,8 @@
                      </xsd:appinfo>
                      <xsd:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
-               <xsd:element maxOccurs="0"
+               </xsd:element> -->
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_1"
                            id="_CRM_PROCES___d4e4776-1">
@@ -328,8 +328,8 @@
                      </xsd:appinfo>
                      <xsd:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
-               <xsd:element maxOccurs="0"
+               </xsd:element> -->
+               <!-- <xsd:element maxOccurs="0"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_GROUP_2"
                            id="_CRM_PROCES___d4e4783-1">
@@ -342,7 +342,7 @@
                      </xsd:appinfo>
                      <xsd:documentation>Tutaj nie dajemy appinfo relation cache - tylko w PARENT_ID do przetworzenia w celu odbudowania</xsd:documentation>
                   </xsd:annotation>
-               </xsd:element>
+               </xsd:element> -->
                <xsd:element maxOccurs="unbounded"
                            minOccurs="0"
                            ref="default_db__x3A__CRM_PROCES:PROCES_BENEFIT_INFO"

+ 4 - 4
SE/se-lib/Route/Storage/AclReinstall.php

@@ -127,16 +127,16 @@ class Route_Storage_AclReinstall extends RouteBase {
 		$diffFieldsToRemove = array_diff($old['fields'], $new['fields']);
 		$sameFields = array_intersect($new['fields'], $old['fields']);
 		echo (!empty($diffFieldsToCreate))
-		?	UI::h('details', [], [
-				UI::h('summary', [], "Pola do dodania (".count($diffFieldsToCreate).")"),
+		?	UI::h('details', [ 'open' => "open" ], [
+				UI::h('summary', [], "Pola do dodania (".count($diffFieldsToCreate)."):"),
 				UI::h('ul', [], array_map(function ($fieldName) {
 					return UI::h('li', [], $fieldName);
 				}, $diffFieldsToCreate)),
 			])
 		:	UI::h('p', [ 'style' => "font-style:italic" ], "Brak pól do dodania");
 		echo (!empty($diffFieldsToRemove))
-		?	UI::h('details', [], [
-				UI::h('summary', [], "Pola do usunięcia (".count($diffFieldsToRemove).")"),
+		?	UI::h('details', [ 'open' => "open", 'style' => "margin:4px 0; background-color:#ccc; border:1px solid #ddd" ], [
+				UI::h('summary', [ 'style' => "padding:4px; outline:none; cursor:pointer" ], "Pola do usunięcia (".count($diffFieldsToRemove)."):"),
 				UI::h('ul', [], array_map(function ($fieldName) {
 					return UI::h('li', [], $fieldName);
 				}, $diffFieldsToRemove)),

+ 2 - 0
SE/se-lib/Schema/SystemObjectFieldStorageAcl.php

@@ -176,8 +176,10 @@ class Schema_SystemObjectFieldStorageAcl extends Core_AclSimpleSchemaBase {
 			set t.idZasob = z.ID
 			where t.objectNamespace = '{$item['namespace']}'
 		");
+		UI::alert('success', "Gotowe");
 
 		{// TODO: DBG
+			$schema = XML::readXmlFileToArray("{$antAclPath}/{$item['name']}.xsd");
 			DBG::nicePrint($schema, '$schema');
 			Lib::loadClass('Core_XmlWriter');
 			ob_start();