svn commit: r1803561 - in /ofbiz/ofbiz-framework/trunk: applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ framework/common/servicedef/ framework/common/webcommon/WEB-INF/ framework/common/widget/

[Deepak Dixit-5]

Author: deepak
Date: Mon Jul 31 18:34:18 2017
New Revision: 1803561

URL: http://svn.apache.org/viewvc?rev=1803561&view=rev
Log:
Improved: Removing Assignment between UserLogin and SecurtyGroup does not work, (OFBIZ-9543)
Updated label from remove to expire while removing security group from user login, also added new entity-auto service to expire user login security group record.

Thanks S. Yazied for reporting the issue.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml
    ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
    ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml
    ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Mon Jul 31 18:34:18 2017
@@ -1270,9 +1270,9 @@ under the License.
         <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
     </request-map>
-    <request-map uri="ProfileRemoveUserLoginFromSecurityGroup">
+    <request-map uri="ProfileExpireUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeUserLoginToSecurityGroup"/>
+        <event type="service" path="" invoke="expireUserLoginSecurityGroup"/>
         <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
     </request-map>

Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml Mon Jul 31 18:34:18 2017
@@ -582,7 +582,7 @@ under the License.
                 <set field="tabButtonItem" value="viewprofile"/>
                 <set field="cancelPage" from-field="parameters.CANCEL_PAGE" default-value="viewprofile"/>
                 <set field="addUserLoginSecurityGroupURI" value="ProfileAddUserLoginToSecurityGroup"/>
-                <set field="removeUserLoginSecurityGroupURI" value="ProfileRemoveUserLoginFromSecurityGroup"/>
+                <set field="expireUserLoginSecurityGroupURI" value="ProfileExpireUserLoginFromSecurityGroup"/>
                 <set field="updateUserLoginSecurityGroupURI" value="ProfileUpdateUserLoginToSecurityGroup"/>
                 <set field="userLoginId" from-field="parameters.userLoginId"/>
                 <entity-one entity-name="UserLogin" value-field="editUserLogin"/>

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=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_security.xml Mon Jul 31 18:34:18 2017
@@ -83,6 +83,11 @@ under the License.
         <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
     </service>
+    <service name="expireUserLoginSecurityGroup" engine="entity-auto" invoke="expire" default-entity-name="UserLoginSecurityGroup" auth="true">
+        <description>Expire UserLoginSecurityGroup</description>
+        <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
+        <auto-attributes include="pk" mode="IN"/>
+    </service>
     <service name="removeUserLoginToSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="UserLoginSecurityGroup" auth="true">
         <description>Remove a UserLogin to SecurityGroup Appl</description>
         <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/security-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/security-controller.xml?rev=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/security-controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/security-controller.xml Mon Jul 31 18:34:18 2017
@@ -118,9 +118,9 @@ under the License.
         <response name="success" type="view" value="EditSecurityGroupPermissions"/>
         <response name="error" type="view" value="EditSecurityGroupPermissions"/>
     </request-map>
-    <request-map uri="removeUserLoginFromSecurityGroup">
+    <request-map uri="expireUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+        <event type="service" path="" invoke="expireUserLoginSecurityGroup"/>
         <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
         <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
     </request-map>
@@ -160,9 +160,9 @@ under the License.
         <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
     </request-map>
-    <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
+    <request-map uri="userLogin_expireUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
+        <event type="service" path="" invoke="expireUserLoginSecurityGroup"/>
         <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
     </request-map>

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=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityForms.xml Mon Jul 31 18:34:18 2017
@@ -198,8 +198,8 @@ under the License.
             </entity-condition>
         </actions>
         <field name="groupId"><hidden/></field>
-        <field name="userLoginId" sort-field="true">
-            <hyperlink description="${userLoginId}" target="editlogin" also-hidden="false">
+        <field name="userLoginId" sort-field="true" widget-style="buttontext">
+            <hyperlink description="${userLoginId}" target="editlogin">
                 <parameter param-name="userLoginId"/>
             </hyperlink>
         </field>
@@ -207,11 +207,10 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}" sort-field="true"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonExpire}" target="expireUserLoginFromSecurityGroup" also-hidden="false">
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
-                <parameter param-name="thruDate" from-field="date:nowTimestamp()"/>
             </hyperlink>
         </field>
     </form>
@@ -257,12 +256,11 @@ under the License.
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}" red-when="before-now"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="${removeUserLoginSecurityGroupURI}" also-hidden="false">
+            <hyperlink description="${uiLabelMap.CommonExpire}" target="${expireUserLoginSecurityGroupURI}" also-hidden="false">
                 <parameter param-name="partyId"/>
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
-                <parameter param-name="thruDate" from-field="date:nowTimestamp()"/>
             </hyperlink>
         </field>
     </form>

Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml?rev=1803561&r1=1803560&r2=1803561&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml Mon Jul 31 18:34:18 2017
@@ -195,7 +195,7 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditUserLoginSecurityGroups"/>
                 <set field="tabButtonItem" value="EditUserLoginSecurityGroups"/>
                 <set field="addUserLoginSecurityGroupURI" value="userLogin_addUserLoginToSecurityGroup"/>
-                <set field="removeUserLoginSecurityGroupURI" value="userLogin_removeUserLoginFromSecurityGroup"/>
+                <set field="expireUserLoginSecurityGroupURI" value="userLogin_expireUserLoginFromSecurityGroup"/>
                 <set field="updateUserLoginSecurityGroupURI" value="userLogin_updateUserLoginToSecurityGroup"/>
                 <set field="userLoginId" from-field="parameters.userLoginId"/>
                 <entity-one entity-name="UserLogin" value-field="editUserLogin"/>