svn commit: r1653477 - in /ofbiz/trunk/specialpurpose/my
Locked
svn commit: r1653477 - in /ofbiz/trunk/specialpurpose/my
 
|
Author: jleroux
Date: Wed Jan 21 10:52:21 2015 New Revision: 1653477 URL: http://svn.apache.org/r1653477 Log: A patch from Pierre Smits for "Move Portal Mgt functions in MyPortal" https://issues.apache.org/jira/browse/OFBIZ-5812 Portal page admin functionalities are included in WebTools, but should be also in MyPortal for those users that don't have access to WebTools. Added: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml (with props) ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml (with props) Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1653477&r1=1653476&r2=1653477&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Wed Jan 21 10:52:21 2015 @@ -248,4 +248,31 @@ <value xml:lang="zh">æçé¨æ·é¡µé¢</value> <value xml:lang="zh-TW">å ¥å£ç¶²é </value> </property> + <property key="PageTitleFindPortalPage"> + <value xml:lang="en">Find Portal page</value> + <value xml:lang="fr">Rech. page portail</value> + <value xml:lang="it">Ricerca pagine portale</value> + <value xml:lang="ja">ãã¼ã¿ã«ãã¼ã¸ãæ¤ç´¢</value> + <value xml:lang="pt">Encontrar a página do Portal</value> + <value xml:lang="vi">Tìm trang Cá»ng thông tin</value> + <value xml:lang="zh">æ¥æ¾é¨æ·é¡µé¢</value> + <value xml:lang="zh_TW">æ¥è©¢å ¥å£ç¶²é </value> + </property> + <property key="WebtoolsAdminPortalPage"> + <value xml:lang="en">Portal page Admin.</value> + <value xml:lang="fr">Admin. Page portail</value> + <value xml:lang="ja">ãã¼ã¿ã«ãã¼ã¸ã®ç®¡ç</value> + <value xml:lang="vi">Quản trá» Cá»ng thông tin</value> + <value xml:lang="zh">é¨æ·é¡µé¢ç®¡ç</value> + <value xml:lang="zh_TW">å ¥å£ç¶²é é¢ç®¡ç</value> + </property> + + <property key="AdminPortalPage"> + <value xml:lang="en">Portal page Admin.</value> + <value xml:lang="fr">Admin. Page portail</value> + <value xml:lang="ja">ãã¼ã¿ã«ãã¼ã¸ã®ç®¡ç</value> + <value xml:lang="vi">Quản trá» Cá»ng thông tin</value> + <value xml:lang="zh">é¨æ·é¡µé¢ç®¡ç</value> + <value xml:lang="zh-TW">å ¥å£ç¶²é é¢ç®¡ç</value> + </property> </resource> Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=1653477&r1=1653476&r2=1653477&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Wed Jan 21 10:52:21 2015 @@ -52,10 +52,45 @@ <response name="success" type="view" value="LookupUserLoginAndPartyDetails"/> </request-map> + <!-- PortalPage administration --> + <request-map uri="FindPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindPortalPage"/> + </request-map> + <request-map uri="EditPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="DuplicatePortalPage"> + <security https="true" auth="true"/> + <event type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <response name="success" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="NewPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="CreatePortalPage"/> + </request-map> + <request-map uri="createPortalPageAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="createPortalPage"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="CreatePortalPage"/> + </request-map> + <request-map uri="updatePortalPageAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPage"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <view-map name="main" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/> <view-map name="login" type="screen" page="component://myportal/widget/CommonScreens.xml#login"/> <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/> <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> - + + <!-- PortalPage administration --> + <view-map name="FindPortalPage" type="screen" page="component://myportal/widget/PortalAdmScreens.xml#FindPortalPage"/> + <view-map name="CreatePortalPage" type="screen" page="component://myportal/widget/PortalAdmScreens.xml#CreatePortalPage"/> + <view-map name="EditPortalPage" type="screen" page="component://myportal/widget/PortalAdmScreens.xml#EditPortalPage"/> </site-conf> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=1653477&r1=1653476&r2=1653477&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Wed Jan 21 10:52:21 2015 @@ -49,6 +49,38 @@ under the License. </widgets> </section> </screen> + + <screen name="AdminDecorator"> + <section> + <actions> + <!-- base/top/specific map first, then more common map added for shared labels --> + <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + + <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/> + <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/> + <set field="applicationMenuName" value="MyPortalAppBar" global="true"/> + <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/> + <!-- + <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/> + <script location="component://common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy"/> + <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/> + <set field="my" value="My" global="true"/> + --> + </actions> + <widgets> + <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> + </widgets> + </section> + </screen> <screen name="CommonPartyDecorator"> <section> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=1653477&r1=1653476&r2=1653477&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Wed Jan 21 10:52:21 2015 @@ -20,7 +20,8 @@ under the License. <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="MyPortalAppBar" title="${uiLabelMap.PageTitleMyPortal} ${partyNameView.personalTitle} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName} ${partyNameView.groupName}" + <menu name="MyPortalAppBar" + title="${uiLabelMap.PageTitleMyPortal} ${partyNameView.personalTitle} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName} ${partyNameView.groupName}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="main" parent-portal-page-value="${parameters.parentPortalPageId}"/> <menu-item name="Dashboard" title="${uiLabelMap.CommonPreferences}" align-style="opposed"> @@ -28,6 +29,54 @@ under the License. <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> </link> </menu-item> + <menu-item name="portalAdmin" title="${uiLabelMap.AdminPortalPage}"> + <condition> + <if-has-permission permission="MYPORTALBASE_ADMIN"/> + </condition> + <link target="FindPortalPage"/> + </menu-item> + </menu> + + <menu name="PortalPageAdmin"> + <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}"> + <link target="DuplicatePortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> + <menu-item name="new" title="${uiLabelMap.CommonNew}"> + <link target="NewPortalPage"/> + </menu-item> + <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}"> + <link target="EditPortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> + <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}"> + <condition> + <and><if-has-permission permission="WEBTOOLS_VIEW"/> + <or> + <if-has-permission permission="MYPORTALBASE_ADMIN"/> + </or> + </and> + </condition> + <link target="FindPortalPage"/> + </menu-item> + </menu> + + <menu name="PortalPageAdmin"> + <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}"> + <link target="DuplicatePortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> + <menu-item name="new" title="${uiLabelMap.CommonNew}"> + <link target="NewPortalPage"/> + </menu-item> + <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}"> + <link target="EditPortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> </menu> </menus> Added: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml?rev=1653477&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml (added) +++ ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml Wed Jan 21 10:52:21 2015 @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="FindPortalPages" type="single" target="FindPortalPage" default-entity-name="PortalPage"> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="portalPageId" position="1" title="${uiLabelMap.CommonId}"><text-find/></field> + <field name="originalPortalPageId" position="2"><text-find/></field> + <field name="portalPageName" title="${uiLabelMap.CommonName}"><text-find/></field> + <field name="parentPortalPageId" position="2"><text-find/></field> + <field name="description"><text-find/></field> + <field name="securityGroupId" position="2" title="${uiLabelMap.CommonSecurityGroupId}"><text-find/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + + <form name="ListPortalPages" type="list" list-name="listIt" paginate-target="FindPortalPage" separate-columns="true" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map-list="listIt" > + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="PortalPage"/> + <field-map field-name="orderBy" from-field="parameters.sortField"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <field name="portalPageId" title="${uiLabelMap.CommonId}" sort-field="true"> + <hyperlink description="${portalPageId}" target="EditPortalPage"> + <parameter param-name="portalPageId"/> + </hyperlink> + </field> + <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> + <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" sort-field="true"> + <display> + <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> + <simple-editor/> + <field-map field-name="portalPageId" from-field="portalPageId"/> + </in-place-editor> + </display> + </field> + <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" sort-field="true"><display/></field> + <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" sort-field="true"> + <display> + <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> + <simple-editor/> + <field-map field-name="portalPageId" from-field="portalPageId"/> + </in-place-editor> + </display> + </field> + <field name="parentPortalPageId" sort-field="true"><display/></field> + <field name="sequenceNum" sort-field="true"><display/></field> + <field name="originalPortalPageId" sort-field="true"><display/></field> + <field name="ownerUserLoginId" sort-field="true"><display/></field> + <field name="securityGroupId" title="${uiLabelMap.CommonSecurityGroupId}" sort-field="true"><display/></field> + <field name="deleteLink" use-when="originalPortalPageId!=null" title=" " widget-style="buttontext" > + <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}"> + <parameter param-name="portalPageId"/> + <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> + </hyperlink> + </field> + </form> + + <form name="EditPortalPage" type="single" target="${targetPortalPage}" default-map-name="portalPage"> + <field name="portalPageId" use-when="!"${portalPage.portalPageId}".equals("")" position="1"><display/></field> + <field name="portalPageId" use-when=""${portalPage.portalPageId}".equals("")" position="1"><text/></field> + <field name="originalPortalPageId" position="2"><text/></field> + <field name="ownerUserLoginId"> + <!-- <lookup target-form-name="LookupUserLoginAndPartyDetails"/> --> + <text/> + </field> + <field name="parentPortalPageId" position="2"><text/></field> + <field name="portalPageName"><text/></field> + <field name="description" position="2"><text size="60"/></field> + <field name="sequenceNum"><text/></field> + <field name="securityGroupId" > + <drop-down allow-empty="true"> + <entity-options description="${groupId} -- ${description}" entity-name="SecurityGroup" key-field-name="groupId"></entity-options> + </drop-down> + </field> + <field name="saveButton" position="2"><submit button-type="button"/></field> + </form> + +</forms> Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml?rev=1653477&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml (added) +++ ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml Wed Jan 21 10:52:21 2015 @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + + <!-- list all PortalPage in a tabular format --> + <screen name="FindPortalPage"> + <section> + <actions> + <set field="headerItem" value="portalAdmin"/> + <set field="titleProperty" value="PageTitleFindPortalPage"/> + </actions> + <widgets> + <decorator-screen name="AdminDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="PORTALPAGE" action="_MAINT"/> + </condition> + <widgets> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindPortalPages" location="component://myportal/widget/PortalAdmForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListPortalPages" location="component://myportal/widget/PortalAdmForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PortalPageViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CreatePortalPage"> + <section> + <actions> + <set field="targetPortalPage" value="createPortalPageAdm"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <actions> + <set field="portalPage.portalPageId" value=""/> + <set field="editPortalPageId" value="Y"/> + </actions> + <widgets><include-form name="EditPortalPage" location="component://myportal/widget/PortalAdmForms.xml"/></widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="EditPortalPage"> + <section> + <actions> + <set field="headerItem" value="PortalPageAdminItem"/> + <set field="layoutSettings.javaScripts[]" value="/images/myportal.js" global="true"/> + <set field="layoutSettings.styleSheets[+0]" value="/images/myportal.css" global="true"/> + <entity-one entity-name="PortalPage" value-field="portalPage"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <not><if-empty field="portalPage"/></not> + </condition> + <actions><set field="targetPortalPage" value="updatePortalPageAdm"/></actions> + <widgets> + <screenlet title="${uiLabelMap.CommonPortalEditPage}" navigation-menu-name="PortalPageAdmin"> + <include-menu name="PortalPageAdmin" location="component:/myportal/widget/MyPortalMenus.xml"/> + <include-form name="EditPortalPage" location="component://myportal/widget/PortalAdmForms.xml"/> + </screenlet> + </widgets> + </section> + <section> + <widgets> + <screenlet title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName} [${portalPage.portalPageId}]"> + <include-portal-page id="${portalPage.portalPageId}" conf-mode="true" use-private="false" /> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/myportal/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |