svn commit: r759070 - in /ofbiz/trunk: applications/party/webapp/partymgr/WEB-INF/ applications/party/webapp/partymgr/party/ applications/party/webapp/partymgr/party/profileblocks/ framework/common/webcommon/WEB-INF/

[hansbak-2]

Author: hansbak
Date: Fri Mar 27 09:28:02 2009
New Revision: 759070

URL: http://svn.apache.org/viewvc?rev=759070&view=rev
Log:
some more security and go back updates

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
    ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=759070&r1=759069&r2=759070&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Mar 27 09:28:02 2009
@@ -46,7 +46,10 @@
 
     <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map>
 
-    <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile" save-current-view="true"/></request-map>
+    <request-map uri="viewprofile">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="viewprofile" save-home-view="true"/>
+    </request-map>
     <request-map uri="EditPartyRelationships"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRelationships"/></request-map>
     <request-map uri="viewroles"><security https="true" auth="true"/><response name="success" type="view" value="viewroles"/></request-map>
     <request-map uri="linkparty"><security https="true" auth="true"/><response name="success" type="view" value="linkparty"/></request-map>
@@ -117,7 +120,10 @@
         <response name="error" type="view" value="viewprofile"/>
     </request-map>
 
-    <request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map>
+    <request-map uri="editcontactmech">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="editcontactmech" save-current-view="true"/>
+    </request-map>
     <request-map uri="createContactMech">
         <security https="true" auth="true"/>
         <event type="service" invoke="createPartyContactMech"/>
@@ -133,7 +139,7 @@
     <request-map uri="deleteContactMech">
         <security https="true" auth="true"/>
         <event type="service" invoke="deletePartyContactMech"/>
-        <response name="success" type="view" value="editcontactmech"/>
+        <response name="success" type="view-home" value="editcontactmech"/>
         <response name="error" type="view" value="editcontactmech"/>
     </request-map>
 

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=759070&r1=759069&r2=759070&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Fri Mar 27 09:28:02 2009
@@ -225,9 +225,9 @@
   </table>
   </div>
   <div class="button-bar">
-    <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
+    <a href="<@ofbizUrl>backHome</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
     <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
   </div>
 <#else>
-  <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
+  <a href="<@ofbizUrl>backHome</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonGoBack}</a>
 </#if>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=759070&r1=759069&r2=759070&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Fri Mar 27 09:28:02 2009
@@ -137,7 +137,7 @@
                   <a href="<@ofbizUrl>editcontactmech?partyId=${party.partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
                 </#if>
                 <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == party.partyId>
-                  <a href="<@ofbizUrl>deleteContactMech/viewprofile?partyId=${party.partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
+                  <form name="deleteContact" target="<@ofbizUrl>deleteContactMech</@ofbizUrl>"><input name="partyId" value="${party.partyId}" type="hidden"/><input name="contactMechId" value="${contactMech.contactMechId}" type="hidden"/><a href="javascript:document.deleteContact.submit()">${uiLabelMap.CommonExpire}</a>
                 </#if>
               </td>
             </tr>

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=759070&r1=759069&r2=759070&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Fri Mar 27 09:28:02 2009
@@ -140,6 +140,14 @@
         <response name="success" type="view" value="geoLocation"/>
     </request-map>
     
+    <!-- home/last/current mappings -->
+    <request-map uri="backHome">
+        <response name="success" type="view-home"/>
+    </request-map>
+    <request-map uri="backLast">
+        <response name="success" type="view-last"/>
+    </request-map>
+    
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="main" type="none"/>