Author: jleroux
Date: Fri Jun 26 21:12:46 2015
New Revision: 1687851
URL: http://svn.apache.org/r1687851
Log:
OFBIZ-6536 - The "Create new" link under partymgr has disappeared
This patch removes CreateNewParty intermediate screen. This screen used to just
include a menu. This menu is now into findParty screen, the security has been
moved from screen to menu.
The CreateNewParty screen is not used elsewhere so can disappear, so is
findparty.ftl, replaced by form widgets
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.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=1687851&r1=1687850&r2=1687851&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri
Jun 26 21:12:46 2015
@@ -328,8 +328,6 @@ under the License.
<response name="error" type="view" value="viewprofile"/>
</request-map>
- <request-map uri="createnew"><security https="true" auth="true"/><response
name="success" type="view" value="CreateNewParty"/></request-map>
-
<request-map uri="NewCustomer"><security https="true"
auth="true"/><response name="success" type="view"
value="NewCustomer"/></request-map>
<request-map uri="createCustomer">
<security https="true" auth="true"/>
@@ -1321,7 +1319,6 @@ under the License.
<view-map name="ViewRequest" type="screen"
page="component://order/widget/ordermgr/CustRequestScreens.xml#ViewRequest"/>
<view-map name="EditRequest" type="screen"
page="component://order/widget/ordermgr/CustRequestScreens.xml#EditRequest"/>
- <view-map name="CreateNewParty" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#CreateNewParty"/>
<view-map name="NewCustomer" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#NewCustomer"/>
<view-map name="NewProspect" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#NewProspect"/>
<view-map name="NewEmployee" type="screen"
page="component://party/widget/partymgr/PartyScreens.xml#NewEmployee"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1687851&r1=1687850&r2=1687851&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Jun 26
21:12:46 2015
@@ -218,24 +218,39 @@
</link>
</menu-item>
</menu>
- <menu name="create-new-party" type="simple"
menu-container-style="basic-nav">
+ <menu name="create-new-party" menu-container-style="basic-nav">
<menu-item name="create-party-group"
title="${uiLabelMap.PartyCreateNewPartyGroup}">
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+ </condition>
<link target="editpartygroup">
<parameter param-name="create_new" value="Y"/>
</link>
</menu-item>
<menu-item name="create-person"
title="${uiLabelMap.PartyCreateNewPerson}">
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+ </condition>
<link target="editperson">
<parameter param-name="create_new" value="Y"/>
</link>
</menu-item>
<menu-item name="create-customer"
title="${uiLabelMap.PartyCreateNewCustomer}">
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+ </condition>
<link target="NewCustomer"/>
</menu-item>
<menu-item name="create-prospect"
title="${uiLabelMap.PartyCreateNewProspect}">
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+ </condition>
<link target="NewProspect"/>
</menu-item>
<menu-item name="create-employee"
title="${uiLabelMap.PartyCreateNewEmployee}" >
+ <condition>
+ <if-has-permission permission="PARTYMGR" action="_CREATE"/>
+ </condition>
<link target="NewEmployee"/>
</menu-item>
</menu>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1687851&r1=1687850&r2=1687851&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Jun 26
21:12:46 2015
@@ -40,7 +40,9 @@ under the License.
<if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
- <screenlet id="FindPartyPanel"
title="${uiLabelMap.PartyFindParty}" navigation-form-name="lookupparty"
save-collapsed="false" collapsible="true"
initially-collapsed="${initialyCollapsed}">
+ <screenlet id="FindPartyPanel"
title="${uiLabelMap.PartyFindParty}" navigation-menu-name="create-new-party"
+ navigation-form-name="lookupparty"
save-collapsed="false" collapsible="true"
initially-collapsed="${initialyCollapsed}">
+ <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="create-new-party"/>
<include-form name="lookupparty"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
<screenlet
title="${uiLabelMap.CommonSearchResults}" navigation-form-name="ListParty">
@@ -659,35 +661,6 @@ under the License.
</decorator-section>
</decorator-screen>
</widgets>
- </section>
- </screen>
-
- <!-- Create New Party Screen -->
- <screen name="CreateNewParty">
- <section>
- <actions>
- <set field="titleProperty"
value="PageTitleCreateNewPartyDetail"/>
- <set field="headerItem" value="find"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="PARTYMGR"
action="_CREATE"/>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PartyCreateNewParty}">
- <include-menu
location="component://party/widget/partymgr/PartyMenus.xml"
name="create-new-party"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
</section>
</screen>
