svn commit: r987870 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: buscob
Date: Sun Aug 22 11:41:25 2010 New Revision: 987870 URL: http://svn.apache.org/viewvc?rev=987870&view=rev Log: Replaced PartyClassificationTabBar FTL file with a standard TabBar menu Removed: ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=987870&r1=987869&r2=987870&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sun Aug 22 11:41:25 2010 @@ -61,21 +61,28 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="pre-body"> <section> + <condition> + <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> + </condition> <widgets> - <platform-specific> - <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> - </platform-specific> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/> </widgets> </section> </decorator-section> <decorator-section name="body"> <section> + <condition> + <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> + </condition> <widgets> <screenlet id="AddPartyClassificationGroupPartiesPanel" title="${uiLabelMap.PartyClassificationGroups}" collapsible="true"> <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </screenlet> <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> + </fail-widgets> </section> </decorator-section> </decorator-screen> @@ -125,20 +132,27 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="pre-body"> <section> + <condition> + <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> + </condition> <widgets> - <platform-specific> - <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html> - </platform-specific> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/> </widgets> </section> </decorator-section> <decorator-section name="body"> <section> + <condition> + <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> + </condition> <widgets> <screenlet title="${uiLabelMap.PartyClassificationGroup}"> <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </screenlet> </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> + </fail-widgets> </section> </decorator-section> </decorator-screen> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=987870&r1=987869&r2=987870&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Aug 22 11:41:25 2010 @@ -712,5 +712,18 @@ </link> </menu-item> </menu> + + <menu name="PartyClassificationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <menu-item name="EditPartyClassificationGroup" title="${uiLabelMap.PartyClassificationGroups}"> + <link target="EditPartyClassificationGroup"> + <parameter param-name="partyClassificationGroupId"/> + </link> + </menu-item> + <menu-item name="EditPartyClassificationGroupParties" title="${uiLabelMap.PartyParties}"> + <link target="EditPartyClassificationGroupParties"> + <parameter param-name="partyClassificationGroupId"/> + </link> + </menu-item> + </menu> </menus> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |