svn commit: r987162 - in /ofbiz/trunk/applications/part
Locked
svn commit: r987162 - in /ofbiz/trunk/applications/part
 
|
Author: buscob
Date: Thu Aug 19 14:39:01 2010 New Revision: 987162 URL: http://svn.apache.org/viewvc?rev=987162&view=rev Log: Replaced party visits list screen with a more standard findVisits one. Included Search options form for visit filtering and paginations. Some ftl files have not yet been deleted because used in the projectmgr application. Added: ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=987162&r1=987161&r2=987162&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu Aug 19 14:39:01 2010 @@ -716,9 +716,9 @@ under the License. <response name="error" type="view" value="EditPartyRelationships"/> </request-map> - <request-map uri="showvisits"><security https="true" auth="true"/><response name="success" type="view" value="showvisits"/></request-map> + <request-map uri="findVisits"><security https="true" auth="true"/><response name="success" type="view" value="findVisits"/></request-map> <request-map uri="visitdetail"><security https="true" auth="true"/><response name="success" type="view" value="visitdetail"/></request-map> - + <request-map uri="pushPage"> <security https="true" auth="true"/> <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setFollowerPage"/> @@ -1368,7 +1368,7 @@ under the License. <view-map name="CertIssuerProvisions" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#EditX509IssuerProvisions"/> <view-map name="ViewCertificate" type="screen" page="component://party/widget/partymgr/SecurityScreens.xml#ViewCertificate"/> - <view-map name="showvisits" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#showvisits"/> + <view-map name="findVisits" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#FindVisits"/> <view-map name="visitdetail" type="screen" page="component://party/widget/partymgr/VisitScreens.xml#visitdetail"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl?rev=987162&r1=987161&r2=987162&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl Thu Aug 19 14:39:01 2010 @@ -21,7 +21,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.PartyVisits}</li> - <li><a href="<@ofbizUrl>showvisits?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li> + <li><a href="<@ofbizUrl>findVisits?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li> </ul> <br class="clear" /> </div> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=987162&r1=987161&r2=987162&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Thu Aug 19 14:39:01 2010 @@ -24,7 +24,7 @@ <menu-item name="find" title="${uiLabelMap.PartyParties}"><link target="findparty"/></menu-item> <menu-item name="mycomm" title="${uiLabelMap.PartyMyCommunications}"><link target="MyCommunicationEvents"/></menu-item> <menu-item name="comm" title="${uiLabelMap.PartyCommunications}"><link target="FindCommunicationEvents"/></menu-item> - <menu-item name="visits" title="${uiLabelMap.PartyVisits}"><link target="showvisits"/></menu-item> + <menu-item name="visits" title="${uiLabelMap.PartyVisits}"><link target="findVisits"/></menu-item> <menu-item name="classification" title="${uiLabelMap.PartyClassifications}"><link target="showclassgroups"/></menu-item> <menu-item name="security" title="${uiLabelMap.CommonSecurity}"> <condition> Added: ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml?rev=987162&view=auto ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml (added) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyVisitForms.xml Thu Aug 19 14:39:01 2010 @@ -0,0 +1,75 @@ +<?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="FindVisits" type="single" target="findVisits" title="Find and list party visits" + header-row-style="header-row" default-table-style="basic-table"> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="hideSearch"><hidden value="Y"/></field> + + <field name="activeOnly"><check /></field> + <field name="visitId"><text-find ignore-case="true"/></field> + <field name="visitorId"><text-find ignore-case="true"/></field> + <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="userLoginId"><text-find ignore-case="true"/></field> + <field name="userCreated"><date-find type="date"/></field> + <field name="webappName"><text-find ignore-case="true"/></field> + <field name="clientIpAddress"><text-find ignore-case="true"/></field> + + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + + <form name="ListVisits" type="list" separate-columns="true" title="Visits List" list-name="listIt" target="" default-entity-name="Visit" paginate-target="findVisits" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <set field="parameters.sortField" from-field="parameters.sortField" default-value="-visitId"/> + + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="Visit"/> + <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"/> + <field-map field-name="filterByDate" from-field="parameters.activeOnly"/> + </service> + </actions> + + <field name="visitId" widget-style="buttontext" sort-field="true"> + <hyperlink description="${visitId}" target="visitdetail"> + <parameter param-name="visitId"/> + </hyperlink> + </field> + <field name="visitorId" title="${uiLabelMap.PartyVisitorId}" sort-field="true"><display/></field> + <field name="partyId" widget-style="buttontext" sort-field="true"> + <hyperlink description="${partyId}" target="viewprofile"> + <parameter param-name="partyId"/> + </hyperlink> + </field> + <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" sort-field="true"><display/></field> + <field name="userCreated" title="${uiLabelMap.PartyNewUser}" sort-field="true"><display/></field> + <field name="webappName" title="${uiLabelMap.PartyWebApp}" sort-field="true"><display/></field> + <field name="clientIpAddress" title="${uiLabelMap.PartyClientIP}" sort-field="true"><display/></field> + <field name="fromDate" title="${uiLabelMap.CommonFromDate}" sort-field="true"><display/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}" sort-field="true"><display/></field> + </form> + +</forms> Modified: ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml?rev=987162&r1=987161&r2=987162&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml Thu Aug 19 14:39:01 2010 @@ -21,14 +21,12 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="showvisits"> + <screen name="FindVisits"> <section> <actions> - <set field="titleProperty" value="PageTitleVisitList"/> <set field="headerItem" value="visits"/> - <set field="tabButtonItem" value="showvisits"/> - - <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy"/> + <set field="titleProperty" value="PageTitleVisitList"/> + <set field="noConditionFind" value="Y"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -39,9 +37,14 @@ under the License. <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> </condition> <widgets> - <platform-specific> - <html><html-template location="component://party/webapp/partymgr/visit/showvisits.ftl"/></html> - </platform-specific> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindVisits" location="component://party/widget/partymgr/PartyVisitForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListVisits" location="component://party/widget/partymgr/PartyVisitForms.xml"/> + </decorator-section> + </decorator-screen> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -52,6 +55,7 @@ under the License. </widgets> </section> </screen> + <screen name="visitdetail"> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |