Author: hansbak
Date: Wed Mar 11 08:05:34 2009 New Revision: 752401 URL: http://svn.apache.org/viewvc?rev=752401&view=rev Log: move all examples from the common to the example component, edit parameters of portlet in the general managePortalPage screen Added: ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml (with props) ofbiz/trunk/framework/example/data/ExamplePortletData.xml - copied, changed from r751373, ofbiz/trunk/framework/example/data/ExampleDemoData.xml Removed: ofbiz/trunk/framework/common/data/PortalSeedData.xml ofbiz/trunk/framework/common/widget/PortletScreens.xml ofbiz/trunk/framework/example/data/ExampleDemoData.xml Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml ofbiz/trunk/framework/common/ofbiz-component.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/trunk/framework/common/widget/PortalPageScreens.xml ofbiz/trunk/framework/common/widget/PortletEditForms.xml ofbiz/trunk/framework/example/ofbiz-component.xml ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml ofbiz/trunk/framework/example/widget/example/PortletScreens.xml ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original) +++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Wed Mar 11 08:05:34 2009 @@ -19,6 +19,11 @@ --> <entity-engine-xml> + <!-- party --> <PortalPortlet portalPortletId="party" portletName="Party Info" screenName="Party" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group" /> + <!-- communications --> + <PortalPortlet portalPortletId="communicationList" portletName="Communications" screenName="Communications" screenLocation="component://party/widget/partymgr/CommunicationScreens.xml" description="My Communications From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> + + </entity-engine-xml> Modified: ofbiz/trunk/framework/common/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/common/ofbiz-component.xml Wed Mar 11 08:05:34 2009 @@ -53,8 +53,6 @@ <entity-resource type="data" reader-name="seed" loader="main" location="data/PeriodData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/PortalSeedData.xml"/> - <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_cdyne.xml"/> <service-resource type="model" loader="main" location="servicedef/services_email.xml"/> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy Wed Mar 11 08:05:34 2009 @@ -22,6 +22,19 @@ import org.ofbiz.entity.condition.*; // only execute when a user is logged in if (parameters.userLogin) { + if (!parameters.parentPortalPageId) { + portalPage = delegator.findByPrimaryKey("PortalPage", [portalPageId : parameters.portalPageId]); + if (portalPage) { + parameters.parentPortalPageId = portalPage.parentPortalPageId; + if (!parameters.parentPortalPageId) { + if(portalPage.originalPortalPageId) { + parameters.parentPortalPageId = portalPage.originalPortalPageId; + } else { + parameters.parentPortalPageId = portalPage.portalPageId; + } + } + } + } userLoginSecurityGroupId = null; condSec = EntityCondition.makeCondition([ EntityCondition.makeCondition("groupId", EntityOperator.LIKE, parameters.parentPortalPageId + "%"), @@ -41,8 +54,11 @@ EntityCondition.makeCondition("parentPortalPageId", EntityOperator.EQUALS, null) ],EntityOperator.AND); portalMainPages = delegator.findList("PortalPage", cond1, null, null, null, false); + parentPortalPageId = null; if (portalMainPages) { parentPortalPageId = portalMainPages.get(0).portalPageId; + } else { + parentPortalPageId = parameters.parentPortalPageId } // get user and system pages ppCond = Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy Wed Mar 11 08:05:34 2009 @@ -32,6 +32,5 @@ while (iter) { attribute = iter.next(); - context.put(attribute.attrName, attribute.attrValue); } Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Wed Mar 11 08:05:34 2009 @@ -107,7 +107,7 @@ <request-map uri="setUserPreference"> <security https="true" auth="true"/> <event type="service" invoke="setUserPreference"/> - <response name="success" type="request" value="main"/> + <response name="success" type="view-last" value="main"/> <response name="error" type="request" value="main"/> </request-map> Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original) +++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Wed Mar 11 08:05:34 2009 @@ -92,8 +92,8 @@ <request-map uri="setPortalPortletAttributes"> <security https="true" auth="true"/> <event type="simple" invoke="setPortalPortletAttributes" path="org/ofbiz/common/PortalPageMethods.xml"/> - <response name="success" type="request" value="EditPortlet"/> - <response name="error" type="request" value="EditPortlet"/> + <response name="success" type="request" value="ManagePortalPages"/> + <response name="error" type="request" value="ManagePortalPages"/> </request-map> <request-map uri="addPortalPageColumn"> <security https="true" auth="true"/> Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Wed Mar 11 08:05:34 2009 @@ -62,7 +62,7 @@ <li class="remove"><a href="<@ofbizUrl>deletePortalPagePortlet?${portletUrlLink}</@ofbizUrl>" title="${uiLabelMap.CommonRemovePortlet}"> </a></li> <#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)> - <li class="edit"><a href="<@ofbizUrl>EditPortlet?${portletUrlLink}</@ofbizUrl>" title="${uiLabelMap.CommonEditPortletAttributes}"> </a></li> + <li class="edit"><a href="<@ofbizUrl>ManagePortalPages?${portletUrlLink}&editAttributes=Y</@ofbizUrl>" title="${uiLabelMap.CommonEditPortletAttributes}"> </a></li> </#if> <#if !firstInColumn> Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Wed Mar 11 08:05:34 2009 @@ -90,6 +90,24 @@ </screenlet> </widgets> </section> + <section> + <condition> + <and> + <not><if-empty field="portalPage"/></not> + <not><if-empty field="parameters.editAttributes"/></not> + </and> + </condition> + <actions> + <property-map resource="CommonUiLabels" map-name="uiLabelMap"/> + <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/> + <entity-one entity-name="PortalPortlet" value-field="portalPortlet"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.CommonEditPortletAttributes}: ${portalPortlet.portletName}"> + <include-form name="${portalPortlet.editFormName}" location="${portalPortlet.editFormLocation}"/> + </screenlet> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -116,22 +134,4 @@ </section> </screen> - <screen name="EditPortlet"> - <section> - <actions> - <property-map resource="CommonUiLabels" map-name="uiLabelMap"/> - <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/> - <entity-one entity-name="PortalPortlet" value-field="portalPortlet"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <label style="h2">${uiLabelMap.CommonEditPortletAttributes}: ${portalPortlet.portletName}</label> - <include-form name="${portalPortlet.editFormName}" location="${portalPortlet.editFormLocation}"/> - <!-- <include-screen name="${portalPortlet.screenName}" location="${portalPortlet.screenLocation}"/> --> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/framework/common/widget/PortletEditForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortletEditForms.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/PortletEditForms.xml (original) +++ ofbiz/trunk/framework/common/widget/PortletEditForms.xml Wed Mar 11 08:05:34 2009 @@ -32,8 +32,6 @@ <field name="portalPageId"><hidden/></field> <field name="portalPortletId"><hidden/></field> <field name="portletSeqId"><hidden/></field> - - <field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field> </form> <form name="LoginPortletEdit" extends="CommonPortletEdit"> Added: ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml?rev=752401&view=auto ============================================================================== --- ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml (added) +++ ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml Wed Mar 11 08:05:34 2009 @@ -0,0 +1,37 @@ +<?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. +--> + +<entity-engine-xml> + <!-- PortalPortlet Seed Data: system pages --> + <PortalPage portalPageId="EXAMPLE" sequenceNum="0" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page" description="The default example OFBiz portal page" ownerUserLoginId="_NA_"/> + <PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00001" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="EXAMPLE" columnSeqId="00002"/><!-- no width in pixels or percent, use the rest of the space available --> + + <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> + <PortalPagePortlet portalPageId="EXAMPLE" portalPortletId="EXAMPLE_3" portletSeqId="00001" columnSeqId="00002" sequenceNum="1"/> + + <PortalPage portalPageId="EXAMPLE1" sequenceNum="100" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 1" description="Portal page 1" ownerUserLoginId="_NA_"/> + <PortalPageColumn portalPageId="EXAMPLE1" columnSeqId="00001"/> + <PortalPagePortlet portalPageId="EXAMPLE1" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> + + <PortalPage portalPageId="EXAMPLE2" sequenceNum="200" parentPortalPageId="EXAMPLE" portalPageName="Example Portal Page 2" description="Portal page 2" ownerUserLoginId="_NA_"/> + <PortalPageColumn portalPageId="EXAMPLE2" columnSeqId="00001"/> + <PortalPagePortlet portalPageId="EXAMPLE2" portalPortletId="EXAMPLE_1" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> +</entity-engine-xml> Propchange: ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/example/data/ExamplePortalSeedData.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: ofbiz/trunk/framework/example/data/ExamplePortletData.xml (from r751373, ofbiz/trunk/framework/example/data/ExampleDemoData.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExamplePortletData.xml?p2=ofbiz/trunk/framework/example/data/ExamplePortletData.xml&p1=ofbiz/trunk/framework/example/data/ExampleDemoData.xml&r1=751373&r2=752401&rev=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/example/data/ExampleDemoData.xml (original) +++ ofbiz/trunk/framework/example/data/ExamplePortletData.xml Wed Mar 11 08:05:34 2009 @@ -31,11 +31,8 @@ screenName="ExamplePortlet3" screenLocation="component://example/widget/example/PortletScreens.xml" editFormName="ExamplePortlet3Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml" /> - <PortletCategory portletCategoryId="SAMPLE" description="Sample Portlet(s)"/> - - <PortletPortletCategory portalPortletId="WELCOME" portletCategoryId="SAMPLE"/> - <PortletPortletCategory portalPortletId="LOGIN" portletCategoryId="SAMPLE"/> - <PortletPortletCategory portalPortletId="EXAMPLE_1" portletCategoryId="SAMPLE"/> - <PortletPortletCategory portalPortletId="EXAMPLE_2" portletCategoryId="SAMPLE"/> - <PortletPortletCategory portalPortletId="EXAMPLE_3" portletCategoryId="SAMPLE"/> + <PortletCategory portletCategoryId="EXAMPLE" description="Example Portlet(s)"/> + <PortletPortletCategory portalPortletId="EXAMPLE_1" portletCategoryId="EXAMPLE"/> + <PortletPortletCategory portalPortletId="EXAMPLE_2" portletCategoryId="EXAMPLE"/> + <PortletPortletCategory portalPortletId="EXAMPLE_3" portletCategoryId="EXAMPLE"/> </entity-engine-xml> Modified: ofbiz/trunk/framework/example/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/ofbiz-component.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/example/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/example/ofbiz-component.xml Wed Mar 11 08:05:34 2009 @@ -36,6 +36,8 @@ <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ExampleDemoData.xml"/> <!-- service resources: model(s), eca(s) and group definitions --> Modified: ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml (original) +++ ofbiz/trunk/framework/example/widget/example/PortletEditForms.xml Wed Mar 11 08:05:34 2009 @@ -50,6 +50,7 @@ <field name="SpecificSubTitle" entry-name="attributeMap.SpecificSubTitle"> <text/> </field> + <field name="updateButton"><submit/></field> </form> </forms> Modified: ofbiz/trunk/framework/example/widget/example/PortletScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/PortletScreens.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/PortletScreens.xml (original) +++ ofbiz/trunk/framework/example/widget/example/PortletScreens.xml Wed Mar 11 08:05:34 2009 @@ -44,8 +44,19 @@ <screen name="ExamplePortlet3"> <section> + <actions> + <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/> + </actions> <widgets> - <label text="Hi, this is a third example of portlet"/> + <container style="leftclear"> + <label style="h1" text="Hi, this is a third example of portlet with editable parameters."/> + </container> + <container style="leftclear"> + <label style="h2" text="SpecificTitle: ${SpecificTitle}"/> + </container> + <container style="leftclear"> + <label style="h2" text="SpecificSubTitle: ${SpecificSubTitle}"/> + </container> </widgets> </section> </screen> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=752401&r1=752400&r2=752401&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Wed Mar 11 08:05:34 2009 @@ -102,8 +102,6 @@ <PortalPortlet portalPortletId="ListCustRequestsComp" portletName="List Cust Requests Completed" screenName="ListCustRequestsCompleted" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Cust Requests Completed From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListPartyCommEvents" portletName="List Party Comm Events" screenName="ListPartyCommEvents" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Party Comm Events in myportal from party" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> <PortalPortlet portalPortletId="ListProjects" portletName="List Projects" screenName="ListProjects" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="List Projects From MyPortal" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="WELCOME" portletName="Welcome" screenName="welcomePortlet" screenLocation="component://common/widget/PortletScreens.xml" description="OFBiz Welcome Message" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> - <PortalPortlet portalPortletId="LOGIN" portletName="Login" screenName="loginPortlet" screenLocation="component://common/widget/PortletScreens.xml" editFormName="LoginPortletEdit" editFormLocation="component://common/widget/PortletEditForms.xml" description="Login Form" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" /> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> |
Free forum by Nabble | Edit this page |