Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

# Conflicts:
#	SE/schema/ant-object/default_db.BI_audit_KRS_PKD/BI_audit_KRS_PKD/BI_audit_KRS_PKD.xsd

SE/schema/ant-object/default_db.BI_audit_KRS_PKD/BI_audit_KRS_PKD/BI_audit_KRS_PKD.xsd

@@ -39,7 +39,11 @@
          <xs:element name="A_STATUS_INFO" type="xs:string" id="dit_KRS_PKD___d5e17778-1_A_STATUS_I"/>
          <xs:element name="L_APPOITMENT_USER" type="xs:string"
             id="dit_KRS_PKD___d5e17779-1_L_APPOITME"/>
+<<<<<<< HEAD
          <!--<xs:element ref="SystemObjects__x3A__AccessOwner:AccessOwner"
+=======
+         <xs:element ref="SystemObjects__x3A__AccessOwner:AccessOwner"
+>>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                      id="dit_KRS_PKD___d5e17780-1">
             <xs:annotation>
                <xs:appinfo>
@@ -49,20 +53,28 @@
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>
-         </xs:element>-->
+         </xs:element>
          <xs:element name="A_CLASSIFIED" type="xs:string" id="dit_KRS_PKD___d5e17785-1_A_CLASSIFI"/>
+<<<<<<< HEAD
          <!--<xs:element ref="SystemObjects__x3A__AccessGroup:AccessGroupRead"
+=======
+         <xs:element ref="SystemObjects__x3A__AccessGroup:AccessGroupRead"
+>>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                      id="dit_KRS_PKD___d5e17786-1">
             <xs:annotation>
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="A_CLASSIFIED"
+<<<<<<< HEAD
                                                    system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/name"/>
+=======
+                                                   system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/uid"/>
+>>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>
-         </xs:element>-->
-         <!--<xs:element name="A_ADM_COMPANY"
+         </xs:element>
+         <xs:element name="A_ADM_COMPANY"
                      type="xs:string"
                      id="dit_KRS_PKD___d5e17791-1_A_ADM_COMP"/>
          <xs:element ref="SystemObjects__x3A__AccessGroup:AccessGroupWrite"
@@ -71,11 +83,15 @@
                <xs:appinfo>
                   <system_cache__appinfo:flat_relation_cache>
                      <system_cache__appinfo:source system_cache__appinfo:name="A_ADM_COMPANY"
+<<<<<<< HEAD
                                                    system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/name"/>
+=======
+                                                   system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/uid"/>
+>>>>>>> f596a4855fad80c45981d33f2c83de21140fe38d
                   </system_cache__appinfo:flat_relation_cache>
                </xs:appinfo>
             </xs:annotation>
-         </xs:element>-->
+         </xs:element>
          <xs:element name="ID" type="xs:integer" id="dit_KRS_PKD___d5e17797-1_ID"/>
          <xs:element name="PKD_NAME" type="xs:string" id="dit_KRS_PKD___d5e17798-1_PKD_NAME"/>
          <xs:element name="PKD_NUMBER" type="xs:string" id="dit_KRS_PKD___d5e17799-1_PKD_NUMBER"/>

SE/schema/ant-object/default_db.TEST_PERMS/TestPermsAnt/TestPermsAnt.xsd

@@ -76,7 +76,7 @@
                          <xs:appinfo>
                             <system_cache__appinfo:flat_relation_cache>
                                <system_cache__appinfo:source system_cache__appinfo:name="A_CLASSIFIED"
-                                                             system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/login"/>
+                                                             system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupRead/uid"/>
                             </system_cache__appinfo:flat_relation_cache>
                          </xs:appinfo>
                       </xs:annotation>
@@ -86,7 +86,7 @@
                          <xs:appinfo>
                             <system_cache__appinfo:flat_relation_cache>
                                <system_cache__appinfo:source system_cache__appinfo:name="A_ADM_COMPANY"
-                                                             system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/login"/>
+                                                             system_cache__appinfo:xpath="SystemObjects__x3A__AccessGroup:AccessGroupWrite/uid"/>
                             </system_cache__appinfo:flat_relation_cache>
                          </xs:appinfo>
                       </xs:annotation>

SE/se-lib/Schema/AccessGroupStorageAcl.php

@@ -43,6 +43,14 @@ class Schema_AccessGroupStorageAcl extends Core_AclBase {// Read only class
 		$fields[100002] = ['name'=>'uid', 'perms'=>'R', 'opis'=>'', 'label'=>'', 'sort_prio'=>102];
 		return $fields;
 	}
+	public function getSqlFieldName($fieldName) {
+		switch ($fieldName) {
+			case 'id': return 'ID';
+			case 'name': return 'DESC';
+			case 'uid': return 'ID';
+		}
+		throw new Exception("Unknown field '{$fieldName}' in AccessGroup (" . $this->getName() . ")");
+	}
 	public function getFieldType($fieldName) { return null; }
 
 	// TODO: replace legacy functions: isAllowed, hasFieldPerm, getFieldIdByName