OFBiz › OFBiz - Commits

svn commit: r472612 - in /incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF: actions/layout/ pagedefs/layout/

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

svn commit: r472612 - in /incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF: actions/layout/ pagedefs/layout/

jacopoc
Author: jacopoc
Date: Wed Nov  8 11:48:21 2006
New Revision: 472612

URL: http://svn.apache.org/viewvc?view=rev&rev=472612
Log:
minor cleanups for the content component

Removed:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/htmlareaprep.bsh
Modified:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/AddLayout.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayout.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutHtml.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutImage.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutSubContent.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutText.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutUrl.xml

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/editsubcontentprep.bsh Wed Nov  8 11:48:21 2006
@@ -91,11 +91,6 @@
     singleWrapper.putInContext("currentValue", currentMap);
 }
 
-//if (!contentIdTo.equals("TEMPLATE_MASTER")) {
-//Debug.logInfo("in editsubcontentprep(2), contentIdTo:" + contentIdTo, "");
-    //context.put("dynamicPrimaryHTMLField", "textData");
-//}
-
 singleWrapper.putInContext("contentIdTo", contentIdTo);
 mapKey = (String)paramMap.get("mapKey");
 Debug.logInfo("in editsubcontentprep, mapKey:" + mapKey, "");

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/layout/findrelatedlayouts.bsh Wed Nov  8 11:48:21 2006
@@ -28,21 +28,17 @@
 
 
 LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
-GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
-
-formDefFile = page.getProperty("formDefFile");
-listFormName = page.getProperty("listFormName");
 
 currentValue = (GenericValue)request.getAttribute("currentValue");
 if (currentValue != null) {
     contentId = (String)currentValue.get("contentId");
-    HashMap inMap     = new HashMap();
+    HashMap inMap = new HashMap();
     inMap.put("assocTypes", UtilMisc.toList("SUB_CONTENT"));
     inMap.put("contentId", contentId);
     inMap.put("direction", "TO");
     
     Debug.logInfo("in findrelatedlayouts, inMap:" + inMap,"");
-    Map result     = null;
+    Map result = null;
     try {
                result = dispatcher.runSync("getAssocAndContentAndDataResource", inMap    );
     } catch (GenericServiceException e) {

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/AddLayout.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/AddLayout.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/AddLayout.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/AddLayout.xml Wed Nov  8 11:48:21 2006
@@ -17,15 +17,17 @@
 <page>
     <template>main</template>
     <property name="title">Add Layout</property>
-    <property name="formDefFile">/layout/LayoutForms.xml</property>    
-    <property name="singleFormName">AddLayout</property>    
     <property name="subMenu">/layout/layout_menu.ftl</property>    
     <property name="headerItem">Layout</property>    
+    
+    <property name="formDefFile">/layout/LayoutForms.xml</property>    
+    <property name="singleFormName">AddLayout</property>    
     <property name="entityName">ContentDataResourceView</property>    
+    
     <property name="permission">CONTENTMGR</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_CREATE</property>    
     <property name="permissionType">simple</property>    
+    
     <page-action name="/includes/permprep.bsh"/>
     <content-action name="/includes/formprep.bsh"/>
 </page>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayout.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayout.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayout.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayout.xml Wed Nov  8 11:48:21 2006
@@ -23,10 +23,8 @@
     <property name="headerItem">Layout</property>    
     <property name="entityName">ContentDataResourceView</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
-    <property name="primaryHTMLField">textData</property>    
     <page-action name="/includes/permprep.bsh"/>
     <content-action name="/layout/layoutprep.bsh"/>
     <content-action name="/includes/currentvalprep.bsh"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutHtml.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutHtml.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutHtml.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutHtml.xml Wed Nov  8 11:48:21 2006
@@ -26,8 +26,6 @@
     <property name="headerItem">Layout</property>    
     <property name="entityName">SubContentDataResourceView</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="primaryHTMLField">textData</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <page-action name="/includes/permprep.bsh"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutImage.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutImage.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutImage.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutImage.xml Wed Nov  8 11:48:21 2006
@@ -26,7 +26,6 @@
     <property name="headerItem">Layout</property>    
     <property name="entityName">SubContentDataResourceView</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <page-action name="/includes/permprep.bsh"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutSubContent.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutSubContent.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutSubContent.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutSubContent.xml Wed Nov  8 11:48:21 2006
@@ -26,12 +26,9 @@
     <property name="headerItem">Layout</property>    
     <property name="entityName">SubContentDataResourceView</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="primaryHTMLField"></property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <page-action name="/includes/permprep.bsh"/>
-    <page-action name="/layout/htmlareaprep.bsh"/>
     <content-action name="/includes/currentvalprep.bsh"/>
     <content-action name="/layout/editsubcontentprep.bsh"/>
     <content-action name="/layout/findrelatedlayouts.bsh"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutText.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutText.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutText.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutText.xml Wed Nov  8 11:48:21 2006
@@ -26,7 +26,6 @@
     <property name="addFormName">AddLayoutText</property>    
     <property name="editFormName">EditLayoutText</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <page-action name="/includes/permprep.bsh"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutUrl.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutUrl.xml?view=diff&rev=472612&r1=472611&r2=472612
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutUrl.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/EditLayoutUrl.xml Wed Nov  8 11:48:21 2006
@@ -26,7 +26,6 @@
     <property name="headerItem">Layout</property>    
     <property name="entityName">SubContentDataResourceView</property>    
     <property name="permission">CONTENTMGR</property>    
-    <property name="priKeyName">contentId</property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <page-action name="/includes/permprep.bsh"/>


Free forum by Nabble Edit this page