svn commit: r747100 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/FixedAssetScreens.xml widget/Menus.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r747100 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/FixedAssetScreens.xml widget/Menus.xml

jleroux@apache.org
Author: jleroux
Date: Mon Feb 23 18:40:07 2009
New Revision: 747100

URL: http://svn.apache.org/viewvc?rev=747100&view=rev
Log:
A patch from Santosh Malviya " Fixed Asset Geo Location Screen not showing" (https://issues.apache.org/jira/browse/OFBIZ-2204) - OFBIZ-2204

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=747100&r1=747099&r2=747100&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Feb 23 18:40:07 2009
@@ -1902,9 +1902,9 @@
     </request-map>
 
     <!-- GeoLocation-->
-    <request-map uri="FixedAssetGeolocation">
+    <request-map uri="FixedAssetGeoLocation">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="FixedAssetGeolocation"/>
+        <response name="success" type="view" value="FixedAssetGeoLocation"/>
         <response name="error" type="view" value="EditFacility"/>
     </request-map>
     
@@ -2147,7 +2147,7 @@
     <view-map name="taxAuthorityVATReport" type="screen" page="component://accounting/widget/TaxAuthorityForms.xml#TaxAuthorityVATReport"/>
     -->
 
-    <view-map name="FixedAssetGeolocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeolocation"/>    
+    <view-map name="FixedAssetGeoLocation" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetGeoLocation"/>    
 
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=747100&r1=747099&r2=747100&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Mon Feb 23 18:40:07 2009
@@ -557,17 +557,17 @@
         </section>
     </screen>
     
-    <screen name="FixedAssetGeolocation">
+    <screen name="FixedAssetGeoLocation">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleFixedAssetGeoLocation"/>
-                <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset//FixedAssetGeolocation.groovy"/>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/FixedAssetGeoLocation.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
                     <decorator-section name="body">
                         <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/fixedasset/FixedAssetGeolocation.ftl"/></html>
+                            <html><html-template location="component://accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl"/></html>
                         </platform-specific>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=747100&r1=747099&r2=747100&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Feb 23 18:40:07 2009
@@ -420,8 +420,8 @@
         <menu-item name="FixedAssetDepreciation" title="${uiLabelMap.AccountingFixedAssetDepreciation}">
             <link target="showFixedAssetDepreciation?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
-        <menu-item name="FixedAssetGeolocation" title="${uiLabelMap.CommonGeoLocation}">
-            <link target="FixedAssetGeolocation?fixedAssetId=${fixedAssetId}"/>
+        <menu-item name="FixedAssetGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
+            <link target="FixedAssetGeoLocation?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
     </menu>