Hi Erwan, Any reasons to not close?
Thanks Jacques > Author: erwan > Date: Sun Dec 23 20:16:17 2012 > New Revision: 1425523 > > URL: http://svn.apache.org/viewvc?rev=1425523&view=rev > Log: > Applying OFBIZ-5088 which are misc. cleanups > > Modified: > > ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml > > ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml > > ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml > > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml > > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml > > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletEditForms.xml > > Modified: > ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/applications/party/widget/ProfileForms.xml > Sun Dec 23 20:16:17 2012 > @@ -1145,7 +1145,7 @@ under the License. > <parameter param-name="billingAccountId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="paginate" area-id="" > area-target="refreshPortlet"> > + <on-event-update-area event-type="paginate" area-id="" > area-target="showPortlet"> > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="partyId"/> > </on-event-update-area> > @@ -1178,7 +1178,7 @@ under the License. > <parameter param-name="partyId" > from-field="parameters.partyId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="refreshPortlet" > > + <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="showPortlet" > > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="parameters.partyId"/> > <parameter param-name="billingAccountId"/> > @@ -1241,7 +1241,7 @@ under the License. > <parameter param-name="partyId" > from-field="parameters.partyId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="refreshPortlet"> > + <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="showPortlet"> > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="parameters.partyId"/> > </on-event-update-area> > @@ -1289,7 +1289,7 @@ under the License. > <parameter param-name="partyId" > from-field="parameters.partyId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="refreshPortlet"> > + <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="showPortlet"> > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="parameters.partyId"/> > </on-event-update-area> > @@ -1315,7 +1315,7 @@ under the License. > <parameter param-name="partyId" > from-field="parameters.partyId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="refreshPortlet"> > + <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="showPortlet"> > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="parameters.partyId"/> > </on-event-update-area> > @@ -1351,7 +1351,7 @@ under the License. > <parameter param-name="partyId" > from-field="parameters.partyId"/> > </show-portlet> > </field> > - <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="refreshPortlet"> > + <on-event-update-area event-type="submit" > area-id="${parameters.areaId}" area-target="showPortlet"> > <parameter param-name="portalPortletId" > from-field="parameters.portalPortletId"/> > <parameter param-name="partyId" from-field="parameters.partyId"/> > </on-event-update-area> > > Modified: > ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml > Sun Dec 23 20:16:17 2012 > @@ -18,18 +18,7 @@ > under the License. > --> > <entity-engine-xml> > - <PortletCategory portletCategoryId="GENERIC_PORTLET" > description="Generics portlets usable for easily parametrize portalPages"/> > - <PortalPortlet portalPortletId="GenericPortalPage" portletName="Sub > PortalPage" screenName="GenericPortalPage" > screenLocation="component://common/widget/PortalPageScreens.xml" > editFormName="GenericPortalPageParam" > editFormLocation="component://common/widget/PortletEditForms.xml" > description="a portlet which included a portalPage to be able to have > multiple line, each line being a sub page. This portlet has 1 mandatory > parameters." securityServiceName="" securityMainAction="VIEW"/> > - <PortletPortletCategory portalPortletId="GenericPortalPage" > portletCategoryId="GENERIC_PORTLET"/> > - <PortalPortlet portalPortletId="FindGenericEntity" portletName="Entity > List simple search criteria" screenName="FindGenericEntity" > screenLocation="component://common/widget/PortalPageScreens.xml" > editFormName="FindGenericEntityParam" > editFormLocation="component://common/widget/PortletEditForms.xml" > description="Simple search criteria, only Id (param idName) and description > for entityList, result is sent to List${Entity}Area (FindGenericEntityPrtl > define this area). This portel has 3 mandatory parameters." > securityServiceName="" securityMainAction="VIEW"/> > - <PortletPortletCategory portalPortletId="FindGenericEntity" > portletCategoryId="GENERIC_PORTLET"/> > - <PortalPortlet portalPortletId="GenericScreenlet" portletName="Screenlet > with one screen" screenName="GenericScreenlet" > screenLocation="component://common/widget/PortalPageScreens.xml" > editFormName="GenericScreenletParam" > editFormLocation="component://common/widget/PortletEditForms.xml" > description="Simple portlet using screenlet, with one screen. This portlet > has 3 mandatory parameters." securityServiceName="" > securityMainAction="VIEW"/> > - <PortletPortletCategory portalPortletId="GenericScreenlet" > portletCategoryId="GENERIC_PORTLET"/> > - <PortalPortlet portalPortletId="GenericScreenletAjax" > portletName="Screenlet with one screen called by ajax" > screenName="GenericScreenletAjax" > screenLocation="component://common/widget/PortalPageScreens.xml" > editFormName="GenericScreenletAjaxParam" > editFormLocation="component://common/widget/PortletEditForms.xml" > description="Simple portlet using screenlet, with one screen which was update > by ajax process, so with a div. This portlet has 4 mandatory parameters." > securityServiceName="" securityMainAction="VIEW"/> > - <PortletPortletCategory portalPortletId="GenericScreenletAjax" > portletCategoryId="GENERIC_PORTLET"/> > - <PortalPortlet portalPortletId="GricScltAjaxWithMenu" > portletName="Screenlet with one screen, and one menu called by ajax" > screenName="GenericScreenletAjaxWithMenu" > screenLocation="component://common/widget/PortalPageScreens.xml" > editFormName="GenericScreenletAjaxWithMenuParam" > editFormLocation="component://common/widget/PortletEditForms.xml" > description="Simple portlet using screenlet with a menu, with one screen > which was update by ajax process, so with a div. This portlet has 6 mandatory > parameters." securityServiceName="" securityMainAction="VIEW"/> > - <PortletPortletCategory portalPortletId="GricScltAjaxWithMenu" > portletCategoryId="GENERIC_PORTLET"/> > - <PortalPage portalPageId="_NA_" sequenceNum="000" portalPageName="For > using genericPortletScreen" description="To be able to have parameters at the > portlet level, not PortletPage level" ownerUserLoginId="_NA_"/> > + <PortalPage portalPageId="_NA_" sequenceNum="000" portalPageName="For > portlet attribute default value" description="To be able to have parameters > at the portlet level, not PortletPage level" ownerUserLoginId="_NA_"/> > <!--#Bam# portletWidget --> > <PortletType portletTypeId="Decorator" screenName="portletUiLabelDecorator" > description="use screen and screen location in the portletDecorator" > screenLocation="component://common/widget/PortletTypeScreens.xml"/> > <PortletType portletTypeId="Screenlet" screenName="Screenlet" > description="depending of scriptName, menuName and screenName exist a screen > with call (or not) scriptName in action and include a screenlet with include > formName (or screenName) and include (or not) menuName" > screenLocation="component://common/widget/PortletTypeScreens.xml"/> > > Modified: > ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml > Sun Dec 23 20:16:17 2012 > @@ -27,10 +27,6 @@ under the License. > <security https="true" auth="true"/> > <response name="success" type="view" value="showPortlet"/> > </request-map> > - <request-map uri="refreshPortlet"> > - <security https="true" auth="true"/> > - <response name="success" type="view" value="showPortlet"/> > - </request-map> > <request-map uri="showPortletMainDecorator"> > <security https="true" auth="true"/> > <response name="success" type="view" > value="showPortletMainDecorator"/> > > Modified: > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageForms.xml > Sun Dec 23 20:16:17 2012 > @@ -136,18 +136,6 @@ under the License. > > </form> > > - <form name="FindGenericEntity" type="single" target="list${entity}" > title="" focus-field-name="idName"> > - <field name="idName" > title="${uiLabelMap.FormFieldTitle_${pkIdName}"><text size="16"/></field> > - <field name="idName_op" ><hidden value="contains"/></field> > - <field name="idName_ic" ><hidden value="Y"/></field> > - <field name="description" ><text size="16"/></field> > - <field name="description_op" ><hidden value="contains"/></field> > - <field name="description_ic" ><hidden value="Y"/></field> > - <field name="submitButton" title=" " widget-style="smallSubmit"> > - <hyperlink > target="javascript:ajaxUpdateArea('List${entity}Area', 'list${entity}', > $(FindGenericEntity).serialize());" target-type="plain" > description="${uiLabelMap.CommonSearch}"/> > - </field> > - </form> > - > <form name="EditPortalPageColumnWidth" type="single" > target="updatePortalPageColumnWidth" default-map-name="portalPageColumn"> > <field name="portalPageId"><hidden/></field> > <field name="columnSeqId"><hidden/></field> > > Modified: > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortalPageScreens.xml > Sun Dec 23 20:16:17 2012 > @@ -140,54 +140,6 @@ under the License. > </section> > </screen> > > - <screen name="GenericPortalPage"> > - <section> > - <widgets> > - <include-portal-page id="${pageId}"/> > - </widgets> > - </section> > - </screen> > - <screen name="FindGenericEntity"> > - <section> > - <widgets> > - <screenlet title="${uiLabelMap.${titleLabel}}"> > - <include-form name="FindGenericEntity" > location="component://common/widget/PortalPageForms.xml"/> > - </screenlet> > - </widgets> > - </section> > - </screen> > - <screen name="GenericScreenlet"> > - <section> > - <widgets> > - <screenlet title="${uiLabelMap.${titleLabel}}" > collapsible="true" id="scrlt_${formName}"> > - <include-form name="${formName}" > location="${formLocation}"/> > - </screenlet> > - </widgets> > - </section> > - </screen> > - <screen name="GenericScreenletAjax"> > - <section> > - <widgets> > - <screenlet title="${uiLabelMap.${titleLabel}}"> > - <container id="${divIdArea}"> > - <include-screen name="${screenName}" > location="${screenLocation}"/> > - </container> > - </screenlet> > - </widgets> > - </section> > - </screen> > - <screen name="GenericScreenletAjaxWithMenu"> > - <section> > - <widgets> > - <screenlet title="${uiLabelMap.${titleLabel}}" > navigation-menu-name="${menuName}"> > - <include-menu name="${menuName}" > location="${menuLocation}"/> > - <container id="${divIdArea}"> > - <include-screen name="${screenName}" > location="${screenLocation}"/> > - </container> > - </screenlet> > - </widgets> > - </section> > - </screen> > <screen name="EditPortalPortletAttributes"> > <section> > <actions> > > Modified: > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletEditForms.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletEditForms.xml?rev=1425523&r1=1425522&r2=1425523&view=diff > ============================================================================== > --- > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletEditForms.xml > (original) > +++ > ofbiz/branches/20120329_portletWidget/framework/common/widget/PortletEditForms.xml > Sun Dec 23 20:16:17 2012 > @@ -33,10 +33,6 @@ under the License. > <field name="portalPortletId"><hidden > value="${parameters.portalPortletId}"/></field> > <field name="portletSeqId"><hidden > value="${parameters.portletSeqId}"/></field> > </form> > - <form name="GenericPortalPageParam" extends="CommonPortletEdit"> > - <field name="pageId" required-field="true"><text/></field> > - <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > - </form> > <!--#Bam# portletEditForm --> > <!-- use by portlet throws an extend form--> > <!-- mgmtPageId : portal page with research and quick vision --> > @@ -84,37 +80,5 @@ under the License. > <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > </form> > <!--#Eam# portletEditForm --> > - <form name="FindGenericEntityParam" extends="CommonPortletEdit"> > - <field name="titleLabel" required-field="true"><text/></field> > - <field name="entity" required-field="true"><text/></field> > - <field name="pkIdName" required-field="true"><text/></field> > - <field name="divIdRefresh"><text/></field> > - <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > - </form> > - <form name="GenericScreenletParam" extends="CommonPortletEdit"> > - <field name="titleLabel" required-field="true"><text/></field> > - <field name="divIdRefresh"><text/></field> > - <field name="formName" required-field="true"><text/></field> > - <field name="formLocation" required-field="true"><text/></field> > - <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > - </form> > - <form name="GenericScreenletAjaxParam" extends="CommonPortletEdit"> > - <field name="titleLabel" required-field="true"><text/></field> > - <field name="divIdRefresh"><text/></field> > - <field name="divIdArea" required-field="true"><text/></field> > - <field name="screenName" required-field="true"><text/></field> > - <field name="screenLocation" required-field="true"><text/></field> > - <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > - </form> > - <form name="GenericScreenletAjaxWithMenuParam" > extends="CommonPortletEdit"> > - <field name="titleLabel" required-field="true"><text/></field> > - <field name="divIdRefresh"><text/></field> > - <field name="divIdArea" required-field="true"><text/></field> > - <field name="screenName" required-field="true"><text/></field> > - <field name="screenLocation" required-field="true"><text/></field> > - <field name="menuName" required-field="true"><text/></field> > - <field name="menuLocation" required-field="true"><text/></field> > - <field name="submit" widget-style="smallSubmit"><submit > button-type="button"/></field> > - </form> > > </forms> > >
