Author: mor
Date: Fri Apr 2 12:05:17 2010 New Revision: 930252 URL: http://svn.apache.org/viewvc?rev=930252&view=rev Log: Removed unnecessary occurrences of <or> tag enclosure in a singleton condition expression. in all of the lookup screens. Also removed few empty new lines. Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml ofbiz/trunk/applications/marketing/widget/LookupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml Modified: ofbiz/trunk/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -23,9 +23,7 @@ under the License. <screen name="LookupListLayout"> <section> <condition> - <or> - <if-has-permission permission="CONTENTMGR" action="_VIEW"/> - </or> + <if-has-permission permission="CONTENTMGR" action="_VIEW"/> </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> @@ -46,9 +44,7 @@ under the License. <screen name="LookupSubContent"> <section> <condition> - <or> - <if-has-permission permission="CONTENTMGR" action="_VIEW"/> - </or> + <if-has-permission permission="CONTENTMGR" action="_VIEW"/> </condition> <actions> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -23,9 +23,7 @@ under the License. <screen name="LookupRouting"> <section> <condition> - <or> - <if-has-permission permission="MANUFACTURING" action="_VIEW"/> - </or> + <if-has-permission permission="MANUFACTURING" action="_VIEW"/> </condition> <actions> <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> @@ -52,9 +50,7 @@ under the License. <screen name="LookupRoutingTask"> <section> <condition> - <or> - <if-has-permission permission="MANUFACTURING" action="_VIEW"/> - </or> + <if-has-permission permission="MANUFACTURING" action="_VIEW"/> </condition> <actions> <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/> @@ -78,4 +74,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -25,9 +25,7 @@ under the License. <screen name="LookupSegmentGroup"> <section> <condition> - <or> - <if-has-permission permission="MARKETING" action="_VIEW"/> - </or> + <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> @@ -53,9 +51,7 @@ under the License. <screen name="LookupSalesForecast"> <section> <condition> - <or> - <if-has-permission permission="MARKETING" action="_VIEW"/> - </or> + <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> @@ -75,4 +71,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -23,9 +23,7 @@ under the License. <screen name="LookupOrderHeader"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -54,9 +52,7 @@ under the License. <screen name="LookupOrderHeaderAndShipInfo"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -83,9 +79,7 @@ under the License. <screen name="LookupPurchaseOrderHeaderAndShipInfo"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -111,9 +105,7 @@ under the License. <screen name="LookupCustRequest"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -140,9 +132,7 @@ under the License. <screen name="LookupCustRequestItem"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -169,9 +159,7 @@ under the License. <screen name="LookupQuote"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -197,9 +185,7 @@ under the License. <screen name="LookupQuoteItem"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -226,9 +212,7 @@ under the License. <screen name="LookupRequirement"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -254,9 +238,7 @@ under the License. <screen name="LookupShoppingList"> <section> <condition> - <or> - <if-has-permission permission="ORDERMGR" action="_VIEW"/> - </or> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> @@ -279,4 +261,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -23,9 +23,7 @@ under the License. <screen name="LookupWorkEffort"> <section> <condition> - <or> - <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> - </or> + <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> @@ -52,9 +50,7 @@ under the License. <screen name="LookupTimesheet"> <section> <condition> - <or> - <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> - </or> + <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> @@ -81,9 +77,7 @@ under the License. <screen name="LookupWorkEffortShort"> <section> <condition> - <or> - <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> - </or> + <if-has-permission permission="WORKEFFORTMGR" action="_VIEW"/> </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> @@ -106,4 +100,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -24,9 +24,7 @@ <screen name="LookupPerson"> <section> <condition> - <or> - <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> - </or> + <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> @@ -49,4 +47,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml?rev=930252&r1=930251&r2=930252&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/LookupScreens.xml Fri Apr 2 12:05:17 2010 @@ -70,6 +70,4 @@ under the License. </widgets> </section> </screen> - - </screens> \ No newline at end of file |
Free forum by Nabble | Edit this page |