This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0b15e2f48 Improved: BIRT- Move from hard-coded menu location to
parameterized (OFBIZ-12957) (#97)
0b15e2f48 is described below
commit 0b15e2f48a2377574870388875bf1151b1c26b1f
Author: Pierre Smits <[email protected]>
AuthorDate: Fri Mar 22 09:46:41 2024 +0100
Improved: BIRT- Move from hard-coded menu location to parameterized
(OFBIZ-12957) (#97)
Move the menu location in the various birt screens from hard-coded to
parameterized.
modified:
- BirtForms.xml
- BirtScreens.xml
---
birt/widget/birt/BirtForms.xml | 2 +-
birt/widget/birt/BirtScreens.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/birt/widget/birt/BirtForms.xml b/birt/widget/birt/BirtForms.xml
index 3da638e40..42ac324a3 100644
--- a/birt/widget/birt/BirtForms.xml
+++ b/birt/widget/birt/BirtForms.xml
@@ -139,7 +139,7 @@ under the License.
<field name="masterContentName" sort-field="true"
map-name="masterContent" entry-name="contentName"><display /></field>
<field name="statusId" sort-field="true"><display-entity
entity-name="StatusItem" /></field>
<field name="description" sort-field="true"><display/></field>
- <field name="manageLink"><include-menu name="ListFlexibleBirtAction"
location="component://birt/widget/birt/BirtMenus.xml"/></field>
+ <field name="manageLink"><include-menu name="ListFlexibleBirtAction"
location="${parameters.mainMenuLocation}"/></field>
</form>
</forms>
diff --git a/birt/widget/birt/BirtScreens.xml b/birt/widget/birt/BirtScreens.xml
index 8dba46a8c..756e3541d 100644
--- a/birt/widget/birt/BirtScreens.xml
+++ b/birt/widget/birt/BirtScreens.xml
@@ -41,7 +41,7 @@ under the License.
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
<set field="activeApp" value="birt" global="true"/>
<set field="applicationMenuName" value="BirtAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://birt/widget/birt/BirtMenus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="${parameters.mainMenuLocation}" global="true"/>
<set field="applicationTitle"
from-field="uiLabelMap.BirtExampleApplication" global="true"/>
<set field="helpAnchor" from-field="helpAnchor"
default-value="_birt_ofbiz_plugin"/>
</actions>
@@ -55,7 +55,7 @@ under the License.
<actions>
<set field="headerItem" value="Birt"/>
<set field="subcomponentMenuName"
from-field="subcomponentMenuName" default-value="BirtTabBar" />
- <set field="subcomponentMenuLocation"
from-field="subcomponentMenuLocation"
default-value="component://birt/widget/birt/BirtMenus.xml" />
+ <set field="subcomponentMenuLocation"
from-field="subcomponentMenuLocation"
default-value="${parameters.mainMenuLocation}" />
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -154,7 +154,7 @@ under the License.
<screen name="CommonFlexibleBirtDecorator">
<section>
<actions>
- <set field="subcomponentMenuLocation"
value="component://birt/widget/birt/BirtMenus.xml"/>
+ <set field="subcomponentMenuLocation"
value="${parameters.mainMenuLocation}"/>
<set field="subcomponentMenuName" value="FlexibleBirtTabBar"/>
</actions>
<widgets>
