svn commit: r1809386 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/content/data/ applications/humanres/data/ applications/manufacturing/testdef/data/ applications/order/data/ applications/party/data/ applications/party/w...

[rishi]

Author: rishi
Date: Sat Sep 23 10:16:17 2017
New Revision: 1809386

URL: http://svn.apache.org/viewvc?rev=1809386&view=rev
Log:
Improved: Extend SecurityGroup entity and add name/groupName field. Added groupName field to entity SecurityGroup and related changes done in the data, services and UI. (OFBIZ-9620)
Thanks Suraj Khurana for your patch.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/CompDocData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
    ofbiz/ofbiz-framework/trunk/applications/order/data/OrderSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml
    ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml
    ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml
    ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml
    ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -82,7 +82,7 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="ACCTG_ATX_DELETE"/>
     
     <!-- Security Group to manage all Accounting operations -->
-    <SecurityGroup description="Accounting permission for all accounting functions." groupId="ACCTG_FUNCTNL_ADMIN"/>
+    <SecurityGroup description="Accounting permission for all accounting functions." groupId="ACCTG_FUNCTNL_ADMIN" groupName="Accounting Admin"/>
     <SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCOUNTING_ADMIN"/>
     <SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="OFBTOOLS_VIEW"/>
     <SecurityGroupPermission groupId="ACCTG_FUNCTNL_ADMIN" permissionId="ACCTG_ATX_ADMIN"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/CompDocData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/CompDocData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/CompDocData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/CompDocData.xml Sat Sep 23 10:16:17 2017
@@ -18,7 +18,7 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <SecurityGroup groupId="COMPDOCADMIN" description="CompDoc admin group, all permissions."/>
+    <SecurityGroup groupId="COMPDOCADMIN" description="CompDoc admin group, all permissions." groupName="CompDoc Admin"/>
     <SecurityGroupPermission groupId="COMPDOCADMIN" permissionId="CONTENTMGR_VIEW"/>
     <SecurityGroupPermission groupId="COMPDOCADMIN" permissionId="CONTENTMGR_CREATE"/>
     <SecurityGroupPermission groupId="COMPDOCADMIN" permissionId="CONTENTMGR_DELETE"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -28,7 +28,7 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="CONTENTMGR_ADMIN"/>
 
     <!-- Content ROLE security -->
-    <SecurityGroup groupId="CONTENT_USER" description="Content user group; all limited content permissions."/>
+    <SecurityGroup groupId="CONTENT_USER" groupName="Content User" description="Content user group; all limited content permissions."/>
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_VIEW"/>
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_CREATE"/>
     <SecurityGroupPermission groupId="CONTENT_USER" permissionId="CONTENTMGR_ROLE_UPDATE"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -28,9 +28,9 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="HUMANRES_ADMIN"/>
     
          <!-- OFBiz Recruitment security -->
-    <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/>
-    <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
-    <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
+    <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component." groupName="Humanres Admin"/>
+    <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application." groupName="Humanres Approver"/>
+    <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting." groupName="Humanres Employee"/>
     
     <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/>
     <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/testdef/data/ManufacturingTestsData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/testdef/data/ManufacturingTestsData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/manufacturing/testdef/data/ManufacturingTestsData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/testdef/data/ManufacturingTestsData.xml Sat Sep 23 10:16:17 2017
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <SecurityGroup groupId="MANUFADMIN" description="Manufacturing Admin group, has all permissions to execute manufacturing tasks."/>
+    <SecurityGroup groupId="MANUFADMIN" description="Manufacturing Admin group, has all permissions to execute manufacturing tasks." groupName="Manufacturing Admin"/>
     <SecurityGroupPermission groupId="MANUFADMIN" permissionId="MANUFACTURING_CREATE"/>
     <SecurityGroupPermission groupId="MANUFADMIN" permissionId="MANUFACTURING_DELETE"/>
     <SecurityGroupPermission groupId="MANUFADMIN" permissionId="MANUFACTURING_UPDATE"/>
@@ -36,7 +36,7 @@ under the License.
     <Person partyId="TestManufAdmin" firstName="Manufacturing" lastName="Admin"/>
     <UserLogin partyId="TestManufAdmin" userLoginId="TestManufAdmin"/>
     <UserLoginSecurityGroup userLoginId="TestManufAdmin" groupId="MANUFADMIN" fromDate="2001-05-13 00:00:00"/>
-    <SecurityGroup groupId="SUPPLYADMIN" description="Supply Chain Admin group, has permissions to execute requirement based manufacturing tasks."/>
+    <SecurityGroup groupId="SUPPLYADMIN" description="Supply Chain Admin group, has permissions to execute requirement based manufacturing tasks." groupName="Supply Admin"/>
     <SecurityGroupPermission groupId="SUPPLYADMIN" permissionId="MANUFACTURING_VIEW"/>
     <SecurityGroupPermission groupId="SUPPLYADMIN" permissionId="WORKEFFORTMGR_CREATE"/>
     <SecurityGroupPermission groupId="SUPPLYADMIN" permissionId="WORKEFFORTMGR_UPDATE"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/data/OrderSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/data/OrderSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/data/OrderSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/data/OrderSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -20,13 +20,13 @@ under the License.
 
 <entity-engine-xml>
     <!-- Order Manager security -->
-    <SecurityGroup description="Admin group for restricted order processing." groupId="ORDERPROC"/>
-    <SecurityGroup description="Order Entry Admin group; permissions for creating orders." groupId="ORDERENTRY"/>
-    <SecurityGroup description="Order Admin group, has all order permissions." groupId="ORDERADMIN"/>
-    <SecurityGroup description="Limited Order Admin group, has all limited order permissions." groupId="ORDERADMIN_LTD"/>
-    <SecurityGroup description="Limited Order Admin group for Supplier Agents." groupId="ORDERSUPPLIER_LTD"/>
-    <SecurityGroup description="Order entry with purchasing permissions" groupId="ORDERPURCH"/>
-    <SecurityGroup description="Order entry permission for all stores.  No special role is needed." groupId="ORDERENTRY_ALL"/>
+    <SecurityGroup description="Admin group for restricted order processing." groupId="ORDERPROC" groupName="Order Processing"/>
+    <SecurityGroup description="Order Entry Admin group; permissions for creating orders." groupId="ORDERENTRY" groupName="Order Entry"/>
+    <SecurityGroup description="Order Admin group, has all order permissions." groupId="ORDERADMIN" groupName="Order Admin"/>
+    <SecurityGroup description="Limited Order Admin group, has all limited order permissions." groupId="ORDERADMIN_LTD" groupName="Order Admin (Limited)"/>
+    <SecurityGroup description="Limited Order Admin group for Supplier Agents." groupId="ORDERSUPPLIER_LTD" groupName="Order (Supplier agents)"/>
+    <SecurityGroup description="Order entry with purchasing permissions" groupId="ORDERPURCH" groupName="Order Purchasing"/>
+    <SecurityGroup description="Order entry permission for all stores.  No special role is needed." groupId="ORDERENTRY_ALL" groupName="Order (All stores)"/>
 
     <SecurityGroupPermission groupId="ORDERADMIN_LTD" permissionId="ORDERMGR_VIEW"/>
     <SecurityGroupPermission groupId="ORDERADMIN_LTD" permissionId="ORDERMGR_ROLE_VIEW"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/data/PartySecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -20,7 +20,7 @@ under the License.
 
 <entity-engine-xml>
     <!-- Party Manager security -->
-    <SecurityGroup description="Party Admin group, has all party permissions." groupId="PARTYADMIN"/>
+    <SecurityGroup groupName="Party Admin" description="Party Admin group, has all party permissions." groupId="PARTYADMIN"/>
     <SecurityGroupPermission groupId="PARTYADMIN" permissionId="PARTYMGR_ADMIN"/>
     <SecurityGroupPermission groupId="PARTYADMIN" permissionId="OFBTOOLS_VIEW"/>
 
@@ -56,7 +56,7 @@ under the License.
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="SECURITY_VIEW"/>
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="SECURITY_VIEW"/>
 
-    <SecurityGroup description="Security Admin group, has all permissions to modify security settings in party manager." groupId="SECURITYADMIN"/>
+    <SecurityGroup groupName="Security Admin" description="Security Admin group, has all permissions to modify security settings in party manager." groupId="SECURITYADMIN"/>
     <SecurityGroupPermission groupId="SECURITYADMIN" permissionId="SECURITY_ADMIN"/>
 
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Sep 23 10:16:17 2017
@@ -1064,7 +1064,7 @@ under the License.
         <field name="securityGroupId" title="${uiLabelMap.CommonSecurityGroupId}">
             <drop-down allow-empty="true" text-size="60">
                 <entity-options entity-name="SecurityGroup" key-field-name="groupId">
-                    <entity-order-by field-name="description"/>
+                    <entity-order-by field-name="groupName"/>
                 </entity-options>
             </drop-down>
         </field>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/data/ProductSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -20,14 +20,14 @@ under the License.
 
 <entity-engine-xml>
     <!-- Catalog Manager security -->
-    <SecurityGroup description="Limited Catalog Admin group, has limited catalog permissions." groupId="CATALOGADMIN_LTD"/>
+    <SecurityGroup description="Limited Catalog Admin group, has limited catalog permissions." groupId="CATALOGADMIN_LTD" groupName="Catalog Admin (Limited)"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_VIEW"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_ROLE_CREATE"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_ROLE_UPDATE"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="CATALOG_ROLE_DELETE"/>
     <SecurityGroupPermission groupId="CATALOGADMIN_LTD" permissionId="OFBTOOLS_VIEW"/>
 
-    <SecurityGroup description="Catalog Admin group, has all catalog permissions." groupId="CATALOGADMIN"/>
+    <SecurityGroup description="Catalog Admin group, has all catalog permissions." groupId="CATALOGADMIN" groupName="Catalog Admin"/>
     <SecurityGroupPermission groupId="CATALOGADMIN" permissionId="CATALOG_ADMIN"/>
     <SecurityGroupPermission groupId="CATALOGADMIN" permissionId="CATALOG_PRICE_MAINT"/>
     <SecurityGroupPermission groupId="CATALOGADMIN" permissionId="OFBTOOLS_VIEW"/>
@@ -54,16 +54,16 @@ under the License.
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="CATALOG_PRICE_MAINT"/>
 
     <!-- Image Management security -->
-    <SecurityGroup description="Image Management Admin." groupId="IMAGEADMIN"/>
+    <SecurityGroup description="Image Management Admin." groupId="IMAGEADMIN" groupName="Image Admin"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_ADMIN"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_APPROVE"/>
     <SecurityGroupPermission groupId="IMAGEADMIN" permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="IMAGE_MANAGEMENT_ADMIN"/>
     
-    <SecurityGroup description="Image Management Approve" groupId="IMAGEAPPROVE"/>
+    <SecurityGroup description="Image Management Approve" groupId="IMAGEAPPROVE" groupName="Image Approve"/>
     <SecurityGroupPermission groupId="IMAGEAPPROVE" permissionId="IMAGE_MANAGEMENT_APPROVE"/>
     
-    <SecurityGroup description="Image Management Upload." groupId="IMAGEUPLOAD"/>
+    <SecurityGroup description="Image Management Upload." groupId="IMAGEUPLOAD" groupName="Image Load"/>
     <SecurityGroupPermission groupId="IMAGEUPLOAD" permissionId="IMAGE_MANAGEMENT_UPLOAD"/>
     
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -31,7 +31,7 @@ under the License.
     <SecurityGroupPermission groupId="VIEWADMIN" permissionId="WORKEFFORTMGR_VIEW"/>
     <SecurityGroupPermission groupId="BIZADMIN" permissionId="WORKEFFORTMGR_ADMIN"/>
 
-    <SecurityGroup groupId="WORKEFFORT_USER" description="WorkEffort user group; all limited workeffort permissions."/>
+    <SecurityGroup groupId="WORKEFFORT_USER" description="WorkEffort user group; all limited workeffort permissions." groupName="WorkEffort User"/>
     <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_VIEW"/>
     <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_VIEW"/>
     <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_CREATE"/>
@@ -39,6 +39,6 @@ under the License.
     <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="WORKEFFORTMGR_ROLE_DELETE"/>
     <SecurityGroupPermission groupId="WORKEFFORT_USER" permissionId="OFBTOOLS_VIEW"/>
 
-    <SecurityGroup description="WorkEffort Admin group, has all workeffort permissions." groupId="WORKEFFORTADMIN"/>
+    <SecurityGroup description="WorkEffort Admin group, has all workeffort permissions." groupId="WORKEFFORTADMIN" groupName="WorkEffort Admin"/>
     <SecurityGroupPermission groupId="WORKEFFORTADMIN" permissionId="WORKEFFORTMGR_ADMIN"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml Sat Sep 23 10:16:17 2017
@@ -28,14 +28,14 @@ under the License.
     <service name="createSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="SecurityGroup" auth="true">
         <description>Create an SecurityGroup</description>
         <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
-        <attribute name="groupId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
     <service name="updateSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="SecurityGroup" auth="true">
         <description>Update a SecurityGroup</description>
         <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
-        <attribute name="groupId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
 
     <!-- SecurityPermission services -->

Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml Sat Sep 23 10:16:17 2017
@@ -98,7 +98,7 @@ under the License.
         <field name="userLoginId"><hidden/></field>
         <field name="groupId" title="${uiLabelMap.CommonGroup}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="SecurityGroup" description="${groupId} ${description}">
+                <entity-options entity-name="SecurityGroup" description="${groupId} ${groupName}">
                     <entity-order-by field-name="groupId"/>
                 </entity-options>
             </drop-down>
@@ -118,6 +118,7 @@ under the License.
 
     <form name="CreateSecurityGroup" type="single" target="createSecurityGroup" default-map-name="securityGroup">
         <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" required-field="true"><text size="20" maxlength="20"/></field>
+        <field name="groupName" title="${uiLabelMap.CommonName}"><text/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
         <field name="cancelLink" title=" " widget-style="smallSubmit">
@@ -130,6 +131,7 @@ under the License.
     <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup">
         <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
+        <field name="groupName" title="${uiLabelMap.CommonName}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 

Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityGroupDemoData.xml Sat Sep 23 10:16:17 2017
@@ -21,10 +21,10 @@ under the License.
     <!-- OFBiz Core security -->
     
     <!--  administrative security groups -->
-    <SecurityGroup groupId="FULLADMIN" description="Full Admin group, has all general permissions."/>
-    <SecurityGroup groupId="FLEXADMIN" description="Flexible Admin group, has all granular permissions."/>
-    <SecurityGroup groupId="VIEWADMIN" description="Demo Admin group, has all view permissions."/>
-    <SecurityGroup groupId="BIZADMIN" description="Full Business Applications permission group, has all business app admin permissions, not technical permissions."/>
+    <SecurityGroup groupId="FULLADMIN" description="Full Admin group, has all general permissions." groupName="Full Admin"/>
+    <SecurityGroup groupId="FLEXADMIN" description="Flexible Admin group, has all granular permissions." groupName="Flex Admin"/>
+    <SecurityGroup groupId="VIEWADMIN" description="Demo Admin group, has all view permissions." groupName="View Admin"/>
+    <SecurityGroup groupId="BIZADMIN" description="Full Business Applications permission group, has all business app admin permissions, not technical permissions." groupName="Biz Admin"/>
     
     <!-- general admin tools permission -->
     <SecurityPermission description="Permission to access the Stock OFBiz Manager Applications." permissionId="OFBTOOLS_VIEW"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityPermissionSeedData.xml Sat Sep 23 10:16:17 2017
@@ -31,7 +31,7 @@ under the License.
     <SecurityPermission permissionId="OFBTOOLS_VIEW" description="Permission to access the Stock OFBiz Manager Applications."/>
 
     <!-- normally only permissions in this file, however permission group SUPER is an exception -->
-    <SecurityGroup groupId="SUPER" description="Super admin group, has all *_ADMIN permission loaded as seed data"/>
+    <SecurityGroup groupId="SUPER" description="Super admin group, has all *_ADMIN permission loaded as seed data" groupName="Super"/>
     <SecurityGroupPermission groupId="SUPER" permissionId="OFBTOOLS_VIEW"/>
 
     <!-- System UserLogin Account - see additional data in SecurityExtData -->

Modified: ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml?rev=1809386&r1=1809385&r2=1809386&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml Sat Sep 23 10:16:17 2017
@@ -134,6 +134,7 @@ under the License.
             default-resource-name="SecurityEntityLabels"
             title="Security Component - Security Group Entity">
       <field name="groupId" type="id"></field>
+      <field name="groupName" type="value"></field>
       <field name="description" type="description"></field>
       <prim-key field="groupId"/>
     </entity>