details: /erp/devel/main/rev/f7808f19af24
changeset: 8359:f7808f19af24
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Wed Sep 08 16:25:52 2010 +0530
summary: Fixes issue 14243: Requisition form is not following the logic of
read only for completed status
Read Only Logic is applied to all fields that are covered by their
corresponding triggers.
No impacts due to the change.
details: /erp/devel/main/rev/486a5c808177
changeset: 8360:486a5c808177
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Sep 08 19:26:02 2010 +0200
summary: Related to issue 14486: Problem with session timeout/invalidation &
seam
details: /erp/devel/main/rev/ae9babfb34a9
changeset: 8361:ae9babfb34a9
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Sep 08 21:31:49 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 +++++++
src-db/database/sourcedata/AD_COLUMN.xml | 20 ++++++++++++++
src-db/database/sourcedata/AD_MODULE.xml | 2 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 14 ++++++---
4 files changed, 41 insertions(+), 6 deletions(-)
diffs (225 lines):
diff -r 12afa365cf10 -r ae9babfb34a9
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Tue Sep 07 16:03:38
2010 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Wed Sep 08 21:31:49
2010 +0000
@@ -1200,6 +1200,17 @@
<!--56653DE396CD4C2DBF54D7FA526656D3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--56653DE396CD4C2DBF54D7FA526656D3--></AD_AUXILIARINPUT>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--><AD_AUXILIARINPUT>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA-->
<AD_AUXILIARINPUT_ID><![CDATA[5690CE03FBE749F3BEF24C562F8AB3AA]]></AD_AUXILIARINPUT_ID>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA-->
<AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--> <NAME><![CDATA[DOCSTATUS]]></NAME>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--> <CODE><![cda...@sql=select DOCSTATUS
FROM M_REQUISITION WHERE m_requisition_...@m_requisition_id@]]></CODE>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5690CE03FBE749F3BEF24C562F8AB3AA--></AD_AUXILIARINPUT>
+
<!--58374EA675AF4273BDE2DBC28A131EF0--><AD_AUXILIARINPUT>
<!--58374EA675AF4273BDE2DBC28A131EF0-->
<AD_AUXILIARINPUT_ID><![CDATA[58374EA675AF4273BDE2DBC28A131EF0]]></AD_AUXILIARINPUT_ID>
<!--58374EA675AF4273BDE2DBC28A131EF0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 12afa365cf10 -r ae9babfb34a9 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Sep 07 16:03:38 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Sep 08 21:31:49 2010 +0000
@@ -240251,6 +240251,7 @@
<!--803538--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803538--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803538--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803538-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803538--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--803538--> <SEQNO><![CDATA[100]]></SEQNO>
<!--803538--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240285,6 +240286,7 @@
<!--803539--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803539--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--803539--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803539-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803539--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803539--> <SEQNO><![CDATA[150]]></SEQNO>
<!--803539--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240321,6 +240323,7 @@
<!--803540--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803540--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--803540--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803540-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803540--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803540--> <SEQNO><![CDATA[120]]></SEQNO>
<!--803540--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240355,6 +240358,7 @@
<!--803541--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803541--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--803541--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803541-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803541--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803541--> <SEQNO><![CDATA[130]]></SEQNO>
<!--803541--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240657,6 +240661,7 @@
<!--803550--> <ISPARENT><![CDATA[Y]]></ISPARENT>
<!--803550--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803550--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--803550-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803550--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--803550--> <SEQNO><![CDATA[100]]></SEQNO>
<!--803550--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240691,6 +240696,7 @@
<!--803552--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803552--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803552--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803552-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803552--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--803552--> <SEQNO><![CDATA[110]]></SEQNO>
<!--803552--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240726,6 +240732,7 @@
<!--803553--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803553--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803553--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803553-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803553--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--803553--> <SEQNO><![CDATA[120]]></SEQNO>
<!--803553--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240761,6 +240768,7 @@
<!--803556--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803556--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--803556--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803556-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803556--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803556--> <SEQNO><![CDATA[150]]></SEQNO>
<!--803556--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240795,6 +240803,7 @@
<!--803558--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803558--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--803558--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--803558-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803558--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803558--> <SEQNO><![CDATA[170]]></SEQNO>
<!--803558--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -256969,6 +256978,7 @@
<!--1004400000--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400000--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400000--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400000-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400000--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400000--> <SEQNO><![CDATA[180]]></SEQNO>
<!--1004400000--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257003,6 +257013,7 @@
<!--1004400001--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400001--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400001--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400001-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400001--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400001--> <SEQNO><![CDATA[190]]></SEQNO>
<!--1004400001--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257037,6 +257048,7 @@
<!--1004400002--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400002--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400002--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400002-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400002--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400002--> <SEQNO><![CDATA[200]]></SEQNO>
<!--1004400002--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257072,6 +257084,7 @@
<!--1004400003--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400003--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400003--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400003-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400003--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400003--> <SEQNO><![CDATA[210]]></SEQNO>
<!--1004400003--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257107,6 +257120,7 @@
<!--1004400004--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400004--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400004--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400004-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400004--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400004--> <SEQNO><![CDATA[220]]></SEQNO>
<!--1004400004--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257742,6 +257756,7 @@
<!--1004400025--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400025--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--1004400025--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400025-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400025--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
<!--1004400025--> <SEQNO><![CDATA[290]]></SEQNO>
<!--1004400025--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257882,6 +257897,7 @@
<!--1004400029--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400029--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--1004400029--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400029-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400029--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400029--> <SEQNO><![CDATA[200]]></SEQNO>
<!--1004400029--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257949,6 +257965,7 @@
<!--1004400031--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400031--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400031--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400031-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400031--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400031--> <SEQNO><![CDATA[300]]></SEQNO>
<!--1004400031--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -257983,6 +258000,7 @@
<!--1004400032--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400032--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400032--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400032-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400032--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400032--> <SEQNO><![CDATA[310]]></SEQNO>
<!--1004400032--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -258019,6 +258037,7 @@
<!--1004400033--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400033--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400033--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400033-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400033--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400033--> <SEQNO><![CDATA[320]]></SEQNO>
<!--1004400033--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -258153,6 +258172,7 @@
<!--1004400037--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1004400037--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
<!--1004400037--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1004400037-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--1004400037--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--1004400037--> <SEQNO><![CDATA[360]]></SEQNO>
<!--1004400037--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 12afa365cf10 -r ae9babfb34a9 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 07 16:03:38 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Sep 08 21:31:49 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18350]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18360]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
diff -r 12afa365cf10 -r ae9babfb34a9
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Tue Sep
07 16:03:38 2010 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Wed Sep
08 21:31:49 2010 +0000
@@ -567,16 +567,20 @@
protected void logout(HttpServletRequest request, HttpServletResponse
response)
throws IOException, ServletException {
+ invalidateSession(request);
+
+ // reset the obcontext
+ OBContext.setOBContext((OBContext) null);
+
+ m_AuthManager.logout(request, response);
+ }
+
+ protected void invalidateSession(HttpServletRequest request) {
HttpSession session = request.getSession(false);
if (session != null) {
// finally invalidate the session (this event will be caught by the
session listener
session.invalidate();
}
-
- // reset the obcontext
- OBContext.setOBContext((OBContext) null);
-
- m_AuthManager.logout(request, response);
}
/**
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
