OFBiz › OFBiz - Commits

svn commit: r1682298 - in /ofbiz/branches/release14.12: ./ applications/content/config/ applications/content/webapp/content/WEB-INF/ applications/content/widget/ applications/content/widget/content/ applications/content/widget/website/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mbrohl

svn commit: r1682298 - in /ofbiz/branches/release14.12: ./ applications/content/config/ applications/content/webapp/content/WEB-INF/ applications/content/widget/ applications/content/widget/content/ applications/content/widget/website/

Author: mbrohl
Date: Thu May 28 18:14:46 2015
New Revision: 1682298

URL: http://svn.apache.org/r1682298
Log:
Applied fix from trunk for revision: 1682295
===

Manually applied patch from jira issue OFBIZ-5679: Functionality to add WebSitePathAlias records is missing.
This adds a "Create Website Path Alias" menu item to the WebSiteAliases view and allows to edit/delete teh entries.

Thanks Pierre Smits for reporting the issue and Willem Janssen for providing the patch.

Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/content/config/ContentUiLabels.xml
ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/branches/release14.12/applications/content/widget/CommonScreens.xml
ofbiz/branches/release14.12/applications/content/widget/WebSiteScreens.xml
ofbiz/branches/release14.12/applications/content/widget/content/ContentMenus.xml
ofbiz/branches/release14.12/applications/content/widget/website/WebSiteForms.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 18:14:46 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295

Modified: ofbiz/branches/release14.12/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/config/ContentUiLabels.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/branches/release14.12/applications/content/config/ContentUiLabels.xml Thu May 28 18:14:46 2015
@@ -3696,6 +3696,11 @@
<value xml:lang="zh">èç³»æ¹å¼åè¡¨è§å¾</value>
<value xml:lang="zh_TW">è¯çµ¡æ¸å®æª¢è¦</value>
</property>
+ <property key="ContentWebSitePathAliasCreate">
+ <value xml:lang="de">Neuen Pfad Alias erstellen</value>
+ <value xml:lang="en">Create New Path Alias</value>
+ <value xml:lang="nl">Aanmaken Nieuwe Path Alias</value>
+ </property>
<property key="ContentWebSiteContent">
<value xml:lang="da">Webside indhold</value>
<value xml:lang="de">Webseite Inhalt</value>
@@ -7382,6 +7387,11 @@
<value xml:lang="zh">ç«ç¹åè¡¨</value>
<value xml:lang="zh_TW">ç¶²ç«æ¸å®</value>
</property>
+ <property key="PageTitleEditWebSitePathAlias">
+ <value xml:lang="de">WebSite Pfad Alias bearbeiten</value>
+ <value xml:lang="en">Edit WebSite Path Alias</value>
+ <value xml:lang="nl">Wijzigen WebSite Path Alias</value>
+ </property>
<property key="PageTitleLookupContent">
<value xml:lang="ar">Ø§ÙØ¨ØØ« Ø¹Ù Ø§ÙÙØØªÙÙ</value>
<value xml:lang="da">SÃ¸g indhold</value>

Modified: ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/controller.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/applications/content/webapp/content/WEB-INF/controller.xml Thu May 28 18:14:46 2015
@@ -355,6 +355,28 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="WebSiteAliasesSearchResults"/>
</request-map>
+ <request-map uri="EditWebSitePathAlias">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditWebSitePathAlias"/>
+ </request-map>
+ <request-map uri="createWebSitePathAlias">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createWebSitePathAlias"/>
+ <response name="success" type="view" value="WebSiteAliases"/>
+ <response name="error" type="view" value="EditWebSitePathAlias"/>
+ </request-map>
+ <request-map uri="updateWebSitePathAlias">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateWebSitePathAlias"/>
+ <response name="success" type="view" value="WebSiteAliases"/>
+ <response name="error" type="view" value="EditWebSitePathAlias"/>
+ </request-map>
+ <request-map uri="removeWebSitePathAlias">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeWebSitePathAlias"/>
+ <response name="success" type="request" value="WebSiteAliases"/>
+ <response name="error" type="request" value="WebSiteAliases"/>
+ </request-map>


<request-map uri="WebSiteCms">
@@ -1949,6 +1971,7 @@ under the License.
<view-map name="EditWebSite" page="component://content/widget/WebSiteScreens.xml#EditWebSite" type="screen"/>
<view-map name="WebSiteAliases" page="component://content/widget/WebSiteScreens.xml#WebSiteAliases" type="screen"/>
<view-map name="WebSiteAliasesSearchResults" page="component://content/widget/WebSiteScreens.xml#WebSiteAliasesSearchResults" type="screen"/>
+ <view-map name="EditWebSitePathAlias" type="screen" page="component://content/widget/WebSiteScreens.xml#EditWebSitePathAlias"/>
<view-map name="WebSiteContent" page="component://content/widget/WebSiteScreens.xml#WebSiteContent" type="screen"/>
<view-map name="WebSiteCMS" page="component://content/widget/WebSiteScreens.xml#WebSiteCMS" type="screen"/>
<view-map name="WebSiteCMSContent" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSContent" type="screen"/>

Modified: ofbiz/branches/release14.12/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/CommonScreens.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/content/widget/CommonScreens.xml Thu May 28 18:14:46 2015
@@ -351,6 +351,51 @@ under the License.
</section>
</screen>

+ <screen name="CommonWebSitePathAliasDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="websites"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ <not><if-empty field="parameters.webSiteId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="website" location="component://content/widget/content/ContentMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ </condition>
+ <widgets>
+ 
+ <container>
+ <include-menu name="websitePathAliasMenu" location="component://content/widget/content/ContentMenus.xml"/>
+ </container>
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}] ${${extraFunctionName}}"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.ContentViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="commonLayoutDecorator">
<section>
<actions>

Modified: ofbiz/branches/release14.12/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/WebSiteScreens.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/content/widget/WebSiteScreens.xml Thu May 28 18:14:46 2015
@@ -221,7 +221,7 @@ under the License.
<set field="parameters.fromDate" type="Timestamp" from-field="parameters.fromDate"/>
<entity-condition list="assocs" entity-name="ContentAssoc">
<condition-list>
- <condition-expr field-name="contentId" from-field="parameters.contentIdFrom"/>
+ <condition-expr field-name="contentId" from-field="parameters.contentIdFrom" ignore-if-empty="true"/>
<condition-expr field-name="contentIdTo" from-field="parameters.contentId"/>
<condition-expr field-name="fromDate" from-field="parameters.fromDate" ignore-if-empty="true"/>
<condition-expr field-name="contentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
@@ -310,7 +310,7 @@ under the License.
</widgets>
</section>
</screen>
-
+
<screen name="WebSiteCMSPathAlias">
<section>
<actions>
@@ -337,17 +337,45 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="EditWebSitePathAlias">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditWebSitePathAlias"/>
+ <set field="tabButtonItem" value="PathAlias"/>
+ <set field="labelTitleProperty" value="PageTitleEditWebSitePathAlias"/>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
+ <entity-one entity-name="WebSitePathAlias" value-field="webSitePathAlias"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebSitePathAliasDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleEditWebSitePathAlias}">
+ <include-form name="EditWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="WebSiteAliases">
<section>
<actions>
- <set field="titleProperty" value="ContentPathAlias"/>
+ <set field="titleProperty" value="PageTitleEditWebSitePathAlias"/>
+ <set field="labelTitleProperty" value="PageTitleEditWebSitePathAlias"/>
<set field="webSiteId" from-field="parameters.webSiteId"/>
<set field="tabButtonItem" value="PathAlias"/>
<set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
</actions>
<widgets>
- <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonWebSitePathAliasDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
@@ -362,6 +390,7 @@ under the License.
</widgets>
</section>
</screen>
+
<screen name="WebSiteAliasesSearchResults">
<section>
<actions>

Modified: ofbiz/branches/release14.12/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/content/ContentMenus.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/branches/release14.12/applications/content/widget/content/ContentMenus.xml Thu May 28 18:14:46 2015
@@ -291,6 +291,11 @@ under the License.
<link target="EditWebSite"/>
</menu-item>
</menu>
+ <menu name="websitePathAliasMenu" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="EditWebSitePathAlias" title="${uiLabelMap.ContentWebSitePathAliasCreate}" widget-style="buttontext create">
+ <link target="EditWebSitePathAlias?webSiteId=${webSiteId}"/>
+ </menu-item>
+ </menu>

<menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="EditWebAnalyticsConfig" title="${uiLabelMap.CommonCreate}">

Modified: ofbiz/branches/release14.12/applications/content/widget/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/widget/website/WebSiteForms.xml?rev=1682298&r1=1682297&r2=1682298&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/widget/website/WebSiteForms.xml (original)
+++ ofbiz/branches/release14.12/applications/content/widget/website/WebSiteForms.xml Thu May 28 18:14:46 2015
@@ -92,8 +92,10 @@ under the License.
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
- <field name="pathAlias" sort-field="true"><display/></field>
- <field name="pathAliasTo" sort-field="true"><display/></field>
+ <field name="pathAlias" sort-field="true" widget-style="buttontext">
+ <hyperlink target="EditWebSitePathAlias?webSiteId=${webSiteId}&pathAlias=${pathAlias}" description="${pathAlias}"></hyperlink>
+ </field>
+ <field name="aliasTo" sort-field="true"><display/></field>
<field name="mapKey" sort-field="true"><display/></field>
<field name="contentId" sort-field="true">
<display-entity entity-name="Content" description="${contentName}">
@@ -102,9 +104,30 @@ under the License.
</sub-hyperlink>
</display-entity>
</field>
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink target="removeWebSitePathAlias" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="webSiteId"/>
+ <parameter param-name="pathAlias"/>
+ </hyperlink>
+ </field>
<on-event-update-area event-type="paginate" area-id="search-results" area-target="WebSiteAliasesSearchResults"/>
</form>

+ <form name="EditWebSitePathAlias" type="single" target="updateWebSitePathAlias" title="" default-map-name="webSitePathAlias"
+ header-row-style="header-row" default-table-style="basic-table" default-entity-name="WebSitePathAlias">
+
+ <alt-target use-when="webSitePathAlias==null" target="createWebSitePathAlias"/>
+
+ <auto-fields-service service-name="updateWebSitePathAlias" map-name=""/>
+
+ <field name="webSiteId"><display/></field>
+ <field name="pathAlias" use-when="webSitePathAlias!=null"><display/></field>
+ <field name="pathAlias" use-when="webSitePathAlias==null"><text/></field>
+
+ <field name="submitButton" use-when="webSitePathAlias!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" use-when="webSitePathAlias==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+

<form name="ListWebSiteContent" type="list" list-name="webSiteContent" target="UpdateWebSiteContent"
paginate-target="ListWebSiteContent" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">