Author: hansbak
Date: Sun Jan 31 03:59:51 2010
New Revision: 904970
URL: http://svn.apache.org/viewvc?rev=904970&view=rev
Log:
removed framework dependency on the commonext component introduced in 816083
and as reported in he mailinglist by Adrian
Added:
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
- copied unchanged from r904004,
ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy
Removed:
ofbiz/trunk/applications/commonext/script/changeOrgPartyId.groovy
Modified:
ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Sun Jan 31
03:59:51 2010
@@ -35,7 +35,8 @@
<set field="line.urlText" value="[${userLogin.userLoginId}]"/>
<set field="line.url"
value="/partymgr/control/viewprofile?partyId=${userLogin.partyId}"/>
<set field="layoutSettings.topLines[]" from-field="line"
global="true"/>
- <script
location="component://commonext/script/changeOrgPartyId.groovy"/>
+ <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/showPortletDecorator?portalPortletId="/>
@@ -69,6 +70,13 @@
</actions>
<widgets/>
</section>
+ <section>
+ <condition><if-empty
field="PartyAcctgPrefAndGroupList"/></condition>
+ <actions>
+ <set field="layoutSettings.suppressTab" value=""/><!--
enable ofbiz setup -->
+ </actions>
+ <widgets/>
+ </section>
<decorator-screen name="GlobalDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="pre-body">
<decorator-section-include name="pre-body"/>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Sun Jan 31 03:59:51
2010
@@ -136,7 +136,6 @@
<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]"/>
- <script
location="component://commonext/script/changeOrgPartyId.groovy"/>
</actions>
<widgets>
<!-- render header -->
Modified: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl Sun Jan 31 03:59:51 2010
@@ -28,7 +28,7 @@
<div id="header-nav" class="clearfix" style="display:none">
<ul>
<li><h4>${uiLabelMap.CommonPrimaryApps}</h4></li>
- <#list displayApps as display>
+ <#list displayApps as display>
<#assign thisApp = display.getContextRoot()>
<#assign permission = true>
<#assign selected = false>
@@ -47,15 +47,11 @@
<#if thisApp != "/">
<#assign thisURL = thisURL + "/control/main">
</#if>
- <#--li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li-->
- <#-- Show OFBiz Setup component menu bar when the system not
have an organization -->
- <#if thisApp.equals("/ofbizsetup")>
- <#if PartyAcctgPrefAndGroupList.size() == 0>
- <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
- </#if>
- <#else>
- <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
- </#if>
+ <#if layoutSettings.suppressTab?exists && display.name ==
layoutSettings.suppressTab>
+ <!-- do not display this component-->
+ <#else>
+ <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
+ </#if>
</#if>
</#list>
</ul>
Modified: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl Sun Jan 31 03:59:51
2010
@@ -51,17 +51,15 @@
<#if thisApp != "/">
<#assign thisURL = thisURL + "/control/main">
</#if>
- <#if !selected>
- <#--li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li-->
- <#-- Show OFBiz Setup component menu bar when the system not
have an organization -->
- <#if thisApp.equals("/ofbizsetup")>
- <#if PartyAcctgPrefAndGroupList.size() == 0>
- <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
- </#if>
+ <#if layoutSettings.suppressTab?exists && display.name ==
layoutSettings.suppressTab>
+ <!-- do not display this component-->
<#else>
+ <#if !selected>
<li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
+ <#else>
+ <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
+ </#if>
</#if>
- </#if>
</#if>
</#list>
</ul>
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl Sun Jan 31
03:59:51 2010
@@ -90,13 +90,10 @@
<#if thisApp != "/">
<#assign thisURL = thisURL + "/control/main">
</#if>
- <#-- Show OFBiz Setup component menu bar when the system not
have an organization -->
- <#if thisApp.equals("/ofbizsetup")>
- <#if PartyAcctgPrefAndGroupList.size() == 0>
- <li><a href="${thisURL + externalKeyParam}" <#if
uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
- </#if>
+ <#if layoutSettings.suppressTab?exists && display.name ==
layoutSettings.suppressTab>
+ <!-- do not display this component-->
<#else>
- <li <#if selected>class="selected"</#if>><a
href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
+ <li <#if selected>class="selected"</#if>><a href="${thisURL
+ externalKeyParam}" <#if uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
</#if>
</#if>
</#list>
Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=904970&r1=904969&r2=904970&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Sun Jan 31 03:59:51 2010
@@ -45,12 +45,9 @@
<#if thisApp != "/">
<#assign thisURL = thisURL + "/control/main">
</#if>
- <#-- Show OFBiz Setup component menu bar when the system not have an
organization -->
- <#if thisApp.equals("/ofbizsetup")>
- <#if PartyAcctgPrefAndGroupList.size() == 0>
- <li<#if selected> class="selected"</#if>><a
href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
- </#if>
- <#else>
+ <#if layoutSettings.suppressTab?exists && display.name ==
layoutSettings.suppressTab>
+ <!-- do not display this component-->
+ <#else>
<li<#if selected> class="selected"</#if>><a
href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists>
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}</#if></a></li>
</#if>
</#if>
