You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/07/09 01:17:50 UTC
svn commit: r675047 - in /ofbiz/trunk/applications/party:
webapp/partymgr/party/editcontactmech.ftl
webapp/partymgr/party/profileblocks/Contact.ftl
widget/partymgr/PartyScreens.xml
Author: adrianc
Date: Tue Jul 8 16:17:50 2008
New Revision: 675047
URL: http://svn.apache.org/viewvc?rev=675047&view=rev
Log:
Party Manager contact mech UI fixes. User's couldn't create/edit their own contact info.
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
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=675047&r1=675046&r2=675047&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Tue Jul 8 16:17:50 2008
@@ -19,11 +19,7 @@
<#if !mechMap.contactMech?exists>
<#-- When creating a new contact mech, first select the type, then actually create -->
<#if !preContactMechTypeId?has_content>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyCreateNewContact}</h3>
- </div>
- <div class="screenlet-body">
+ <h1>${uiLabelMap.PartyCreateNewContact}</h1>
<form method="post" action="<@o...@ofbizUrl>" name="createcontactmechform">
<input type="hidden" name="DONE_PAGE" value="${donePage}">
<input type="hidden" name="partyId" value="${partyId}">
@@ -41,8 +37,6 @@
</tr>
</table>
</form>
- </div>
-</div>
</#if>
</#if>
<#if mechMap.contactMechTypeId?has_content>
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=675047&r1=675046&r2=675047&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Tue Jul 8 16:17:50 2008
@@ -21,7 +21,7 @@
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.PartyContactInformation}</li>
- <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+ <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session) || userLogin.partyId == party.partyId>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
@@ -127,10 +127,10 @@
</td>
<td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td>
<td class="button-col">
- <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+ <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == party.partyId>
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
</#if>
- <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session)>
+ <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == party.partyId>
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonExpire}</a>
</#if>
</td>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=675047&r1=675046&r2=675047&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Jul 8 16:17:50 2008
@@ -382,6 +382,7 @@
<if-compare field-name="hasViewPermission" operator="equals" value="true" type="Boolean"/>
<if-compare field-name="hasPcmCreatePermission" operator="equals" value="true" type="Boolean"/>
<if-compare field-name="hasPcmUpdatePermission" operator="equals" value="true" type="Boolean"/>
+ <if-compare-field field-name="parameters.partyId" operator="equals" to-field-name="userLogin.partyId" type="String"/>
<not><if-empty field-name="mechMap.partyContactMech"/></not>
</or>
</condition>
@@ -391,11 +392,11 @@
</platform-specific>
</widgets>
<fail-widgets>
- <container>
- <label style="h3">${uiLabelMap.PartyMsgContactNotBelongToYou}</label>
+ <container style="button-bar">
+ <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/>
</container>
<container>
- <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/>
+ <label style="h3">${uiLabelMap.PartyMsgContactNotBelongToYou}</label>
</container>
</fail-widgets>
</section>