svn commit: r1364220 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/controller.xml webapp/catalog/find/sidecatalogs.ftl widget/catalog/ProdCatalogForms.xml

[jacopoc]

Author: jacopoc
Date: Sun Jul 22 07:16:10 2012
New Revision: 1364220

URL: http://svn.apache.org/viewvc?rev=1364220&view=rev
Log:
Removed invalid links and controller entries (referencing non existing resources).

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
    ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1364220&r1=1364219&r2=1364220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun Jul 22 07:16:10 2012
@@ -3139,7 +3139,6 @@ under the License.
     <view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/>
     <view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/>
 
-    <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/>
     <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/>
     <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/>
     <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/>
@@ -3180,7 +3179,6 @@ under the License.
     <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
     <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
 
-    <view-map name="pendingReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#pendingReviews"/>
     <view-map name="FindReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#FindReviews"/>
 
     <view-map name="ViewProductOrder" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductOrder"/>
@@ -3250,8 +3248,6 @@ under the License.
     <view-map name="ListImageRecentlyApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageRecentlyApproved"/>
     <view-map name="ListPeopleApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleApproved"/>
     <view-map name="ListPeopleRejected" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleRejected"/>
-    <view-map name="AutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#AutomaticResize"/>
-    <view-map name="ListAutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListAutomaticResize"/>
     <view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/>
     <view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/>
     <!-- end of view mappings -->

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1364220&r1=1364219&r2=1364220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidecatalogs.ftl Sun Jul 22 07:16:10 2012
@@ -16,7 +16,6 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<div><a href='<@ofbizUrl>FindProdCatalog</@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductCatalogDetailList}</a></div>
 <div class="browsecategorylist">
   <#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")>
   <#list prodCatalogs as prodCatalog>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1364220&r1=1364219&r2=1364220&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sun Jul 22 07:16:10 2012
@@ -55,22 +55,6 @@ under the License.
         <field name="catalogName" sort-field="true"><display/></field>
         <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
     </form>
-    <!-- form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
-        <actions>
-            <set field="parameters.sortField" from-field="parameters.sortField" default-value="prodCatalogId"/>
-            <entity-and entity-name="ProdCatalog" use-cache="true" list="listIt">
-                <order-by field-name="${parameters.sortField}"/>
-            </entity-and>
-        </actions>
-        <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" widget-style="buttontext" sort-field="true">
-            <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditProdCatalog">
-                <parameter param-name="prodCatalogId"/>
-            </hyperlink>
-        </field>
-        <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" sort-field="true"><display/></field>
-        <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
-    </form-->
     <form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog"
         header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog">