svn commit: r731165 - in /ofbiz/trunk/applications/content: entitydef/ webapp/content/WEB-INF/ webapp/content/website/ widget/content/

[hansbak-2]

Author: hansbak
Date: Sat Jan  3 20:05:48 2009
New Revision: 731165

URL: http://svn.apache.org/viewvc?rev=731165&view=rev
Log:
added website list to editcontent, added some sort statements

Modified:
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
    ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Sat Jan  3 20:05:48 2009
@@ -1523,6 +1523,19 @@
             <key-map field-name="webSiteContentTypeId"/>
         </relation>
     </entity>
+    <view-entity entity-name="WebSiteAndContent"
+        package-name="org.ofbiz.content.website"
+        title="Web Sites by contentId">
+      <member-entity entity-alias="WS" entity-name="WebSite"/>
+      <member-entity entity-alias="WSCT" entity-name="WebSiteContent"/>
+      <alias-all entity-alias="WS"/>
+      <alias-all entity-alias="WSCT">
+        <exclude field="webSiteId"/>
+      </alias-all>
+      <view-link entity-alias="WS" rel-entity-alias="WSCT">
+        <key-map field-name="webSiteId"/>
+      </view-link>
+    </view-entity>
     <entity entity-name="WebSiteContentType"
         package-name="org.ofbiz.content.website"
         title="Web Site Content Type">

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sat Jan  3 20:05:48 2009
@@ -173,6 +173,7 @@
     
     <!-- ================ WebSite Requests ================= -->
     <request-map uri="FindWebSite"><security https="true" auth="true"/><response name="success" type="view" value="FindWebSite"/></request-map>
+    <request-map uri="ListWebSite"><security https="true" auth="true"/><response name="success" type="view" value="ListWebSite"/></request-map>
     <request-map uri="EditWebSite"><security https="true" auth="true"/><response name="success" type="view" value="EditWebSite"/></request-map>
     <request-map uri="createWebSite">
         <security https="true" auth="true"/>
@@ -1686,6 +1687,7 @@
     <view-map name="findContentSearchResults" type="screen" page="component://content/widget/content/ContentScreens.xml#findContentSearchResults"/>
     <view-map name="EditContent" page="component://content/widget/content/ContentScreens.xml#EditContent" type="screen"/>
     <view-map name="EditContentAssoc" page="component://content/widget/content/ContentScreens.xml#EditContentAssoc" type="screen"/>
+    <view-map name="ListWebSite" page="component://content/widget/content/ContentScreens.xml#ListWebSite" type="screen"/>
     
     <view-map name="EditContentAttribute" page="component://content/widget/content/ContentScreens.xml#EditContentAttribute" type="screen"/>
     <view-map name="EditContentMetaData" page="component://content/widget/content/ContentScreens.xml#EditContentMetaData" type="screen"/>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Sat Jan  3 20:05:48 2009
@@ -54,6 +54,7 @@
             <hyperlink description="${webSiteId}" target="EditWebSite?webSiteId=${webSiteId}" also-hidden="false"/>
         </field>
         <field name="siteName" title="${uiLabelMap.CommonName}"><display/></field>
+        <field name="httpHost"><display/></field>
     </form>
 
     <!-- WebSite Content Forms -->

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Jan  3 20:05:48 2009
@@ -240,7 +240,9 @@
         </field>
         <field name="contentAssocTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentAssocType"/>
+                <entity-options description="${description}" entity-name="ContentAssocType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="metaDataPredicateId">
@@ -356,7 +358,9 @@
         <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" ><lookup target-form-name="LookupContent"/></field>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
+                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -413,6 +417,11 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+    <form name="ListWebSites" paginate-target="ListWebSite" paginate="true" extends="ListWebSites" extends-resource="component://content/webapp/content/website/WebSiteForms.xml">
+        <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType" description="${description}"/></field>
+        <field name="fromDate"><display type="date"/></field>
+        <field name="thruDate"><display type="date"/></field>
+    </form>
     <form name="ListContentMetaData" target="updateContentMetaData" title="" type="list"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Sat Jan  3 20:05:48 2009
@@ -63,28 +63,35 @@
                     <if-empty field-name="currentValue.contentId" />
                 </not>
             </condition>
-            <link target="EditContentPurpose?contentId=${contentId}"/>
+            <link target="EditContentPurpose?contentId=${parameters.contentId}"/>
         </menu-item>
         
         <menu-item name="attribute" title="${uiLabelMap.ContentAttribute}" >
             <condition>
                 <not><if-empty field-name="currentValue.contentId"/></not>
             </condition>
-            <link target="EditContentAttribute?contentId=${contentId}"/>
+            <link target="EditContentAttribute?contentId=${parameters.contentId}"/>
         </menu-item>
         
-        <menu-item name="metaData" title="${uiLabelMap.ContentMetadata}" >
+        <menu-item name="websites" title="${uiLabelMap.ContentWebSites}">
             <condition>
                 <not><if-empty field-name="currentValue.contentId"/></not>
             </condition>
-            <link target="EditContentMetaData?contentId=${contentId}"/>
+            <link target="ListWebSite?contentId=${parameters.contentId}"/>
         </menu-item>
 
+        <menu-item name="metaData" title="${uiLabelMap.ContentMetadata}" >
+            <condition>
+                <not><if-empty field-name="currentValue.contentId"/></not>
+            </condition>
+            <link target="EditContentMetaData?contentId=${parameters.contentId}"/>
+        </menu-item>
+        
         <menu-item name="workEffort" title="${uiLabelMap.WorkEffortWorkEffort}" >
             <condition>
                 <not><if-empty field-name="currentValue.contentId"/></not>
             </condition>
-            <link target="EditContentWorkEfforts?contentId=${contentId}"/>
+            <link target="EditContentWorkEfforts?contentId=${parameters.contentId}"/>
         </menu-item>
         
     </menu>

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Sat Jan  3 20:05:48 2009
@@ -278,6 +278,41 @@
         </section>
     </screen>
     
+    <screen name="ListWebSite">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleFindWebSite"/>
+                <set field="labelTitleProperty" value="PageTitleFindWebSite"/>
+                <set field="tabButtonItem" value="websites"/>
+                <entity-condition entity-name="WebSiteAndContent" list-name="webSites">
+                    <condition-expr field-name="contentId" env-name="parameters.contentId"/>
+                    <order-by field-name="webSiteId"/>
+                </entity-condition>
+                <entity-one entity-name="Content" value-name="currentValue">
+                    <field-map field-name="contentId" env-name="parameters.contentId"/>
+                </entity-one>
+            </actions>
+            <widgets>
+                <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PageTitleListWebSite}">
+                                    <include-form name="ListWebSites" location="component://content/widget/content/ContentForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.ContentViewPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     
     <screen name="EditContentMetaData">
         <section>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=731165&r1=731164&r2=731165&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sat Jan  3 20:05:48 2009
@@ -85,7 +85,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="DataResource" default-field-type="find"/>
         <field name="noConditionFind"><hidden value="Y"/></field>
-        
+        <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
         <sort-order>
             <field-group>
                 <sort-field name="dataResourceId"/>
@@ -112,7 +112,6 @@
             </field-group>
         </sort-order>
         
-        <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListLookupDataResource" extends="ListDataResource" list-name="listIt" type="list" paginate-target="LookupDataResource"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -150,12 +149,16 @@
         <field use-when="currentValue==null&amp;&amp;dataResourceId!=null" name="dataResourceId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="statusId" use-when="currentValue==null"><ignored/></field>