svn commit: r678015 - in /ofbiz/trunk: applications/party/config/ applications/party/webapp/part
Locked
svn commit: r678015 - in /ofbiz/trunk: applications/party/config/ applications/party/webapp/part
 
|
Author: hansbak
Date: Fri Jul 18 12:47:53 2008 New Revision: 678015 URL: http://svn.apache.org/viewvc?rev=678015&view=rev Log: fixing several faults and make the screens return to the proper place in mypage Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri Jul 18 12:47:53 2008 @@ -2853,6 +2853,9 @@ <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¹à¸ªà¹à¸à¸£à¸°à¹à¸à¸¨</value> <value xml:lang="zh">缺å°å½å®¶</value> </property> + <property key="PartyCreateAddEmail"> + <value xml:lang="en">Create/Add Email to Party</value> + </property> <property key="PartyCreateAddWebSiteRolePermissionError"> <value xml:lang="en">Security Error: to run addWebSiteRole you must have the PARTYMGR_CREATE or PARTYMGR_ADMIN permission</value> <value xml:lang="es">Error de seguridad: para acceder a esta funcionalidad debe contar con los permisos PARTYMGR_CREATE o PARTYMGR_ADMIN</value> @@ -3157,6 +3160,9 @@ <value xml:lang="th">à¸à¸µà¹à¸¡à¸²à¸à¸à¸ AVS </value> <value xml:lang="zh">Cybersourceå ¬å¸å°åéªè¯æå¡æ¿ä»£</value> </property> + <property key="PartyDeleteEmail"> + <value xml:lang="en">Delete Email</value> + </property> <property key="PartyDeletePartyRolePermissionError"> <value xml:lang="en">Security Error: to run deletePartyRole you must have the PARTYMGR_DELETE or PARTYMGR_ADMIN permission</value> <value xml:lang="fr">Erreur sécurité: pour exécuter deletePartyRole vous devez avoir la permission PARTYMGR_DELETE or PARTYMGR_ADMIN</value> @@ -4647,6 +4653,9 @@ <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸£à¸²à¸¢à¸à¸²à¸£à¸à¸·à¹à¸à¸à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">没æè´ç©å表ï¼ä¼å</value> </property> + <property key="PartyNoSubject"> + <value xml:lang="en">No Subject</value> + </property> <property key="PartyNoSupplier"> <value xml:lang="en">No Supplier</value> <value xml:lang="es">No existe proveedor</value> 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=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Jul 18 12:47:53 2008 @@ -692,6 +692,12 @@ <response name="success" type="view" value="ListLookupCommEvents"/> <response name="error" type="view" value="ListLookupCommEvents"/> </request-map> + <request-map uri="deleteUnknownCommunicationEvent"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteCommunicationEvent"/> + <response name="success" type="view" value="FindCommunicationEvents"/> + <response name="error" type="view" value="ViewCommunicationEvent"/> + </request-map> <request-map uri="deleteCommunicationEvents"> <security https="true" auth="true"/> <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Fri Jul 18 12:47:53 2008 @@ -138,7 +138,7 @@ <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field> <field name="subject"><text size="60"/></field> <field name="contentMimeTypeId"><hidden value="text/plain"/></field> - <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field> + <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20"/></field> <field name="sendButton"><submit button-type="button"/></field> </form> <form name="ViewEmail" type="single" default-map-name="communicationEvent"> @@ -265,9 +265,12 @@ </form> <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate="true" list-name="commEvents"> + <row-actions> + <set field="subject" from-field="subject" default-value="${uiLabelMap.PartyNoSubject}"/> + </row-actions> <field name="communicationEventId"><hidden/></field> <field name="subject"> - <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/> + <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}"/> </field> <field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field> <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"> @@ -628,8 +631,7 @@ </field> </form> - <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address" - default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" default-map-name="context"> + <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address"> <actions> <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy"/> </actions> @@ -639,7 +641,15 @@ <field name="firstName" position="1"><text/></field> <field name="middleName" position="2"><text/></field> <field name="lastName"><text/></field> - <field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submit" title="${uiLabelMap.PartyCreateAddEmail}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="deleteEmail" type="single" title="delete the email" + target="deleteUnknownCommunicationEvent"> + <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field> + <field name="delContentDataResource"><hidden value="Y"/></field> + <field name="" position="1"><display/></field> + <field name=" " position="2"><display/></field> + <field name="deleteEmail" title="Delete email" widget-style="smallSubmit" position="3"><submit/></field> </form> <form name="EditRequestFromCommEvent" type="single" target="createRequestFromCommEvent" default-map-name="parameters"> <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Fri Jul 18 12:47:53 2008 @@ -267,8 +267,10 @@ <label style="h2" text="Allocate this message to a existing or new party and add an email address" /> </container> - <include-form name="allocateMsgToPartyForm" - location="component://party/webapp/partymgr/communication/CommForms.xml" /> + <include-form name="allocateMsgToPartyForm" + location="component://party/webapp/partymgr/communication/CommForms.xml" /> + <include-form name="deleteEmail" + location="component://party/webapp/partymgr/communication/CommForms.xml" /> </screenlet> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Fri Jul 18 12:47:53 2008 @@ -153,7 +153,20 @@ <response name="success" type="view" value="myCommunications"/> <response name="error" type="view" value="ViewCommunicationEvent"/> </request-map> - <request-map uri="deleteCommunicationEvents"> + <request-map uri="deleteUnknownCommunicationEvent"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteCommunicationEvent"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="ViewCommunicationEvent"/> + </request-map> + <request-map uri="deleteMyUnknownCommunicationEvent"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteCommunicationEvent"/> + <response name="success" type="view" value="myCommunications"/> + <response name="error" type="view" value="ViewCommunicationEvent"/> + </request-map> + + <request-map uri="deleteCommunicationEvents"> <security https="true" auth="true"/> <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/> <response name="success" type="view" @@ -191,6 +204,12 @@ <response name="success" type="view" value="otherCommunications"/> <response name="error" type="view" value="ViewCommunicationEvent"/> </request-map> + <request-map uri="deleteOtherCommunicationEvent"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteCommunicationEvent"/> + <response name="success" type="view" value="otherCommunications"/> + <response name="error" type="view" value="ViewCommunicationEvent"/> + </request-map> <view-map name="main" type="screen" page="component://mypage/widget/CommonScreens.xml#main"/> <view-map name="preferences" type="screen" page="component://mypage/widget/CommonScreens.xml#preferences"/> @@ -200,6 +219,7 @@ <view-map name="myCompanyComms" type="screen" page="component://mypage/widget/CommonScreens.xml#MyCompanyComms"/> <view-map name="myTimesheet" type="screen" page="component://mypage/widget/CommonScreens.xml#MyTimesheet"/> <view-map name="newEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#newEvent"/> + <view-map name="ViewCommunicationEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#ViewCommunicationEvent"/> </site-conf> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Jul 18 12:47:53 2008 @@ -113,8 +113,7 @@ </field> </form> <form name="ListMyUnknownPartyEmails" - extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" - use-row-submit="true"> + extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" use-row-submit="true"> <field use-when="headerItem.equals("main")" name="subject" widget-style="buttontext" widget-area-style="fieldWidth300"> <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&type=main"/> @@ -133,10 +132,22 @@ </field> </form> - <form name="allocateMsgToPartyForm" extends="allocateMsgToPartyForm" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> + <form name="allocateMsgToPartyForm" + extends="allocateMsgToPartyForm" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> <alt-target use-when=""otherCommunications".equals(headerItem)" target="allocateOtherMsgToParty"/> <alt-target use-when=""myCommunications".equals(headerItem)" target="allocateMyMsgToParty"/> <field name="type"><hidden value="${parameters.type}"/></field> </form> + <form name="deleteEmail" type="single" title="delete the email" + target="deleteUnknownCommunicationEvent"> + <alt-target use-when=""otherCommunications".equals(headerItem)" target="deleteOtherUnknownCommunicationEvent"/> + <alt-target use-when=""myCommunications".equals(headerItem)" target="deleteMyUnknownCommunicationEvent"/> + <field name="type"><hidden value="${parameters.type}"/></field> + <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field> + <field name="delContentDataResource"><hidden value="Y"/></field> + <field name="" position="1"><display/></field> + <field name=" " position="2"><display/></field> + <field name="deleteEmail" title="Delete email" widget-style="smallSubmit" position="3"><submit/></field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=678015&r1=678014&r2=678015&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Fri Jul 18 12:47:53 2008 @@ -274,8 +274,14 @@ </widgets> </section> </screen> - <!-- screen name="ViewCommunicationEvent"> + <screen name="ViewCommunicationEvent"> <section> + <actions> + <set field="titleProperty" value="PageTitleViewCommunication" /> + <set field="tabButtonItem" value="OverView" /> + <set field="parentCommEventId" from-field="parameters.parentCommEventId" /> + <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" /> + </actions> <widgets> <section> <condition> @@ -307,82 +313,125 @@ </actions> <widgets /> </section> - <section> - <actions> - <set field="titleProperty" value="PageTitleViewCommunication" /> - <set field="tabButtonItem" value="OverView" /> - <set field="parentCommEventId" from-field="parameters.parentCommEventId" /> - <entity-one entity-name="CommunicationEvent" - value-name="communicationEvent" /> - <entity-one entity-name="CommunicationEvent" - value-name="parentEvent" auto-field-map="false"> - <field-map env-name="parentCommEventId" field-name="communicationEventId" /> - </entity-one> - </actions> - <widgets> - <decorator-screen name="CommonCommunicationEventDecorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <or> - <if-compare field-name="communicationEvent.communicationEventTypeId" - operator="equals" value="EMAIL_COMMUNICATION" /> - <if-compare field-name="communicationEvent.communicationEventTypeId" - operator="equals" value="AUTO_EMAIL_COMM" /> - </or> - </condition> - <widgets> - <section> - <condition> - <and> - <if-empty field-name="communicationEvent.partyIdFrom" /> - <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_UNKNOWN_PARTY"/> - </and> - </condition> - <widgets> - <screenlet> - <container> - <label style="h1" text="Origin Email address not known!" /> - </container> - <container> - <label style="h2" - text="Allocate this message to a existing or new party and add an email address" /> - </container> - <include-form name="allocateMsgToPartyForm" - location="component://mypage/widget/MyPageForms.xml" /> - </screenlet> - </widgets> - </section> - <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" - name="ViewEmail" /> - <section> - <actions> - <set field="entityName" value="CustRequestAndCommEvent"/> - <set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/> - </actions> - <widgets> - <label style="h1" text="${uiLabelMap.OrderRequestList}"/> - <screenlet> - <include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> - </screenlet> - </widgets> - </section> - </widgets> - <fail-widgets> - <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" - name="ViewCommEvent" /> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> + <section><widgets> + <decorator-screen name="CommonCommunicationEventDecorator" + location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="lefthalf"> + <section> + <widgets> + <label style="h1" + text="Communication Event id: ${parameters.communicationEventId}"></label> + <include-screen name="commEvent" /> + </widgets> + </section> + </container> + <container style="righthalf"> + <label style="h1" text="${uiLabelMap.CommonRelatedInformation}" /> + <section> + <condition> + <not> + <if-empty field-name="communicationEvent.parentCommEventId" /> + </not> + </condition> + <actions> + <set field="parent" value="${uiLabelMap.CommonParent}"/> + <entity-one entity-name="CommunicationEvent" + value-name="communicationEvent"> + <field-map field-name="communicationEventId" + env-name="communicationEvent.parentCommEventId" /> + </entity-one> + </actions> + <widgets> + <include-screen name="commEvent" /> + </widgets> + </section> + <section> + <actions> + <entity-and list-name="commEvents" entity-name="CommunicationEvent"> + <field-map field-name="parentCommEventId" + env-name="parameters.communicationEventId" /> + </entity-and> + </actions> + <widgets> + <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}"> + <include-form name="ListCommEvents" + location="component://party/webapp/partymgr/communication/CommForms.xml" /> + </screenlet> + </widgets> + </section> + <section> + <actions> + <set field="entityName" value="CustRequestAndCommEvent" /> + <set field="requestParameters.communicationEventId" + from-field="parameters.communicationEventId" /> + </actions> + <widgets> + <screenlet title="${uiLabelMap.OrderRequestList}"> + <include-form name="ListRequests" + location="component://order/webapp/ordermgr/request/RequestForms.xml" /> + </screenlet> + </widgets> + </section> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section></widgets> + </section> + </screen> + <screen name="commEvent"> + <section> + <widgets> + <screenlet title="${parent} ${uiLabelMap.PartyCommunicationEvent}"> + <section> + <condition> + <or><!-- have for e-mails a special form --> + <if-compare field-name="communicationEvent.communicationEventTypeId" + operator="equals" value="EMAIL_COMMUNICATION" /> + <if-compare field-name="communicationEvent.communicationEventTypeId" + operator="equals" value="AUTO_EMAIL_COMM" /> + </or> + </condition> + <widgets> + <section> + <condition> + <and> + <if-compare field-name="communicationEvent.statusId" + operator="equals" value="COM_UNKNOWN_PARTY" /> + <if-empty field-name="communicationEvent.partyIdFrom" /> + </and> + </condition> + <widgets> + <screenlet> + <container> + <label style="h1" text="Origin Email address not known!" /> + </container> + <container> + <label style="h2" + text="Allocate this message to a existing or new party and add an email address" /> + </container> + <include-form name="allocateMsgToPartyForm" + location="component://mypage/widget/MyPageForms.xml" /> + <include-form name="deleteEmail" + location="component://party/webapp/partymgr/communication/CommForms.xml" /> + </screenlet> + </widgets> + </section> + <include-form + location="component://party/webapp/partymgr/communication/CommForms.xml" + name="ViewEmail" /> + </widgets> + <fail-widgets> + <include-form + location="component://party/webapp/partymgr/communication/CommForms.xml" + name="ViewCommEvent" /> + </fail-widgets> + </section> + </screenlet> </widgets> </section> - </screen--> + </screen> </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |