Author: jleroux
Date: Sat May 12 21:01:19 2012
New Revision: 1337649
URL:
http://svn.apache.org/viewvc?rev=1337649&view=revLog:
"Applied fix from trunk for revision: 1337644" (conflicts on GlobalActions handled by hand)
------------------------------------------------------------------------
r1337644 | jleroux | 2012-05-12 22:52:30 +0200 (sam., 12 mai 2012) | 8 lines
Moves the line
<set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
from ApplicationDecorator to GlobalDecorator screen.
This in order to prevent showing the Setup application in all framework components (example, examplext, webtools) when demo data are loaded.
No side effects when loading only extseed data, Setup always shows (logical and tested)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/commonext/widget/CommonScreens.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1337644
Modified: ofbiz/branches/release11.04/applications/commonext/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/commonext/widget/CommonScreens.xml?rev=1337649&r1=1337648&r2=1337649&view=diff==============================================================================
--- ofbiz/branches/release11.04/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release11.04/applications/commonext/widget/CommonScreens.xml Sat May 12 21:01:19 2012
@@ -32,7 +32,6 @@ under the License.
<set field="line.url" value="/partymgr/control/viewprofile?partyId=${userLogin.partyId}"/>
<set field="layoutSettings.topLines[]" from-field="line" global="true"/>
<script location="component://commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy"/><!-- to see ofbizsetup needs to be displayed -->
- <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
<!-- system info notes -->
<service service-name="getLastSystemInfoNote" result-map="resultNote"/>
<set field="linkStart" value="/myportal/control/showPortletMainDecorator?portalPortletId="/>