Author: jleroux
Date: Sat May 12 20:55:30 2012
New Revision: 1337647
URL: http://svn.apache.org/viewvc?rev=1337647&view=rev
Log:
"Applied fix from trunk for revision: 1337644"
------------------------------------------------------------------------
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/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/commonext/widget/CommonScreens.xml
ofbiz/branches/release12.04/framework/common/widget/CommonScreens.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1337644
Modified:
ofbiz/branches/release12.04/applications/commonext/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/commonext/widget/CommonScreens.xml?rev=1337647&r1=1337646&r2=1337647&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/commonext/widget/CommonScreens.xml
(original)
+++ ofbiz/branches/release12.04/applications/commonext/widget/CommonScreens.xml
Sat May 12 20:55:30 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="lastSystemInfoNote1"
from-field="resultNote.lastSystemInfoNote1"/>
Modified: ofbiz/branches/release12.04/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/widget/CommonScreens.xml?rev=1337647&r1=1337646&r2=1337647&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/widget/CommonScreens.xml
(original)
+++ ofbiz/branches/release12.04/framework/common/widget/CommonScreens.xml Sat
May 12 20:55:30 2012
@@ -185,6 +185,7 @@ under the License.
<set field="appbarOpenTemplateLocation"
from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]" />
<set field="appbarCloseTemplateLocation"
from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]" />
<set field="messagesTemplateLocation"
from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" />
+ <set field="layoutSettings.suppressTab"
value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
</actions>
<widgets />
</section>
