svn commit: r1639939 - in /ofbiz/branches/release12.04: ./ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ framework/common/servicedef/ framework/common/webcommon/WEB-INF/ framework/common/widget/

Author: jleroux
Date: Sat Nov 15 23:06:51 2014
New Revision: 1639939

URL: http://svn.apache.org/r1639939
Log:
"Applied fix from trunk for revision: 1639892"
------------------------------------------------------------------------
r1639892 | ashish | 2014-11-15 15:22:21 +0100 (sam. 15 nov. 2014) | 2 lignes

Applied patch from jira issue  - OFBIZ-5551 - Cannot delete the record When Server Timezone and Application timeZone are different.
Thanks  SenthilMurugan for reporting the issue and thanks Deepak for providing the patch.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/branches/release12.04/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/branches/release12.04/framework/common/servicedef/services_security.xml
    ofbiz/branches/release12.04/framework/common/webcommon/WEB-INF/security-controller.xml
    ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1639892

Modified: ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1639939&r1=1639938&r2=1639939&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release12.04/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Nov 15 23:06:51 2014
@@ -1227,7 +1227,7 @@ under the License.
     </request-map>
     <request-map uri="ProfileRemoveUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
         <response name="success" type="view" value="ProfileEditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="ProfileEditUserLoginSecurityGroups"/>
     </request-map>

Modified: ofbiz/branches/release12.04/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/widget/partymgr/SecurityForms.xml?rev=1639939&r1=1639938&r2=1639939&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/branches/release12.04/applications/party/widget/partymgr/SecurityForms.xml Sat Nov 15 23:06:51 2014
@@ -114,6 +114,7 @@ under the License.
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
+                <parameter param-name="thruDate" from-field="date:nowTimestamp()"/>
             </hyperlink>
         </field>
     </form>
@@ -153,6 +154,7 @@ under the License.
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
+                <parameter param-name="thruDate" value="${nowTimestamp}"/>
             </hyperlink>
         </field>
     </form>

Modified: ofbiz/branches/release12.04/framework/common/servicedef/services_security.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/servicedef/services_security.xml?rev=1639939&r1=1639938&r2=1639939&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/servicedef/services_security.xml (original)
+++ ofbiz/branches/release12.04/framework/common/servicedef/services_security.xml Sat Nov 15 23:06:51 2014
@@ -83,13 +83,6 @@ under the License.
         <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
         <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
     </service>
-    <service name="removeUserLoginFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="UserLoginSecurityGroup" auth="true">
-        <description>Remove a UserLogin from a SecurityGroup</description>
-        <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
-        <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
-        <attribute name="groupId" type="String" mode="IN" optional="false"/>
-        <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
-    </service>
 
     <!-- ProtectedView to SecurityGroup services -->
     <service name="addProtectedViewToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="ProtectedView" auth="true">

Modified: ofbiz/branches/release12.04/framework/common/webcommon/WEB-INF/security-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/webcommon/WEB-INF/security-controller.xml?rev=1639939&r1=1639938&r2=1639939&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/webcommon/WEB-INF/security-controller.xml (original)
+++ ofbiz/branches/release12.04/framework/common/webcommon/WEB-INF/security-controller.xml Sat Nov 15 23:06:51 2014
@@ -120,7 +120,7 @@ under the License.
     </request-map>
     <request-map uri="removeUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
         <response name="success" type="view" value="EditSecurityGroupUserLogins"/>
         <response name="error" type="view" value="EditSecurityGroupUserLogins"/>
     </request-map>
@@ -162,7 +162,7 @@ under the License.
     </request-map>
     <request-map uri="userLogin_removeUserLoginFromSecurityGroup">
         <security https="true" auth="true"/>
-        <event type="service" path="" invoke="removeUserLoginFromSecurityGroup"/>
+        <event type="service" path="" invoke="updateUserLoginToSecurityGroup"/>
         <response name="success" type="view" value="EditUserLoginSecurityGroups"/>
         <response name="error" type="view" value="EditUserLoginSecurityGroups"/>
     </request-map>

Modified: ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml?rev=1639939&r1=1639938&r2=1639939&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml (original)
+++ ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml Sat Nov 15 23:06:51 2014
@@ -203,6 +203,7 @@ under the License.
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
+                <parameter param-name="thruDate" from-field="date:nowTimestamp()"/>
             </hyperlink>
         </field>
     </form>
@@ -245,7 +246,7 @@ under the License.
         </field>
         <field name="userLoginId"><hidden/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
-        <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+        <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="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="${removeUserLoginSecurityGroupURI}" also-hidden="false">
@@ -253,6 +254,7 @@ under the License.
                 <parameter param-name="userLoginId"/>
                 <parameter param-name="groupId"/>
                 <parameter param-name="fromDate"/>
+                <parameter param-name="thruDate" from-field="date:nowTimestamp()"/>
             </hyperlink>
         </field>
     </form>