You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/06/03 21:52:29 UTC
svn commit: r662866 - in /ofbiz/trunk/specialpurpose/assetmaint:
webapp/assetmaint/WEB-INF/controller.xml widget/AssetmaintScreens.xml
widget/forms/FixedAssetForms.xml
Author: adrianc
Date: Tue Jun 3 12:52:29 2008
New Revision: 662866
URL: http://svn.apache.org/viewvc?rev=662866&view=rev
Log:
Oops, I accidentally disabled the Find Maintenances screen in my last Asset Maint commit.
Modified:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=662866&r1=662865&r2=662866&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml Tue Jun 3 12:52:29 2008
@@ -32,11 +32,6 @@
</request-map>
<!-- FixedAssetMaintenance -->
- <request-map uri="ListFixedAssetMaints">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListFixedAssetMaints"/>
- <response name="error" type="view" value="ListFixedAssetMaints"/>
- </request-map>
<request-map uri="printFixedAssetMaint.pdf">
<security https="true" auth="true"/>
<response name="success" type="view" value="PrintFixedAssetMaint"/>
@@ -169,6 +164,7 @@
<view-map name="main" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssets"/>
<!-- FixedAsset Maintenance screens -->
+ <view-map name="FindFixedAssetMaints" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#FindFixedAssetMaints"/>
<view-map name="EditFixedAssetMaint" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditFixedAssetMaint"/>
<view-map name="EditWorkEfforts" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEfforts"/>
<view-map name="EditWorkEffortTimeEntries" type="screen" page="component://assetmaint/widget/AssetmaintScreens.xml#EditWorkEffortTimeEntries"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=662866&r1=662865&r2=662866&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Tue Jun 3 12:52:29 2008
@@ -48,43 +48,41 @@
<screen name="FindFixedAssetMaints">
<section>
<actions>
+ <set field="headerItem" value="fixedAssetMaints"/>
<set field="titleProperty" value="PageTitleFindFixedAssetMaints"/>
<set field="labelTitleProperty" value="AccountingFixedAssetMaint"/>
</actions>
<widgets>
- <decorator-screen name="CommonFixedAssetMaintDecorator">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindFixedAssetMaints}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
- </container>
+ <section>
+ <condition>
+ <if-service-permission service-name="fixedAssetPermissionCheck" main-action="VIEW"/>
+ </condition>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <condition>
+ <if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
+ </condition>
+ <widgets>
+ <container style="button-bar"><link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
<include-form name="FindFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleFindFixedAssetMaints}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
+ </decorator-section>
+ <decorator-section name="search-results">
<include-form name="ListFixedAssetMaints" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.AssetMaintViewPermissionError}</label>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=662866&r1=662865&r2=662866&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Tue Jun 3 12:52:29 2008
@@ -119,7 +119,7 @@
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
<form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>