Author: hansbak
Date: Wed Jun 10 09:32:45 2009
New Revision: 783272
URL:
http://svn.apache.org/viewvc?rev=783272&view=revLog:
Applied fix from trunk for revision: 783266
remove on mycommlist did not work and returned to a old unused saved view. save-home now clears save-current/last view
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 10 09:32:45 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266
Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml?rev=783272&r1=783271&r2=783272&view=diff==============================================================================
--- ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jun 10 09:32:45 2009
@@ -370,8 +370,9 @@
<field name="roleTypeId"><hidden/></field>
<field name="deleteCommEventIfLast"><hidden value="Y"/></field>
<field name="delContentDataResource"><hidden value="Y"/></field>
+ <field name="partyId"><hidden/></field>
+ <field name="communicationEventId"><hidden/></field>
<field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
- <field name="removeButton" widget-style="smallSubmit"><submit/></field>
<field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
<hyperlink description="${subject} " target="ViewCommunicationEvent">
<parameter param-name="communicationEventId"/>
@@ -392,6 +393,7 @@
</display-entity>
</field>
<field name="createdStamp" entry-name="entryDate"/>
+ <field name="removeButton" widget-style="smallSubmit"><submit/></field>
</form>
<form name="ListPendingCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
Modified: ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=783272&r1=783271&r2=783272&view=diff==============================================================================
--- ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Wed Jun 10 09:32:45 2009
@@ -718,6 +718,9 @@
//Debug.log("======save home view: " + view);
req.getSession().setAttribute("_HOME_VIEW_NAME_", view);
req.getSession().setAttribute("_HOME_VIEW_PARAMS_", paramMap);
+ // clear other saved views
+ req.getSession().removeAttribute("_SAVED_VIEW_NAME_");
+ req.getSession().removeAttribute("_SAVED_VIEW_PARAMS_");
}
ConfigXMLReader.ViewMap viewMap = (view == null ? null : getControllerConfig().viewMapMap.get(view));
Locked
