details: https://code.openbravo.com/erp/devel/pi/rev/5ae34663c033
changeset: 34139:5ae34663c033
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed May 30 13:03:45 2018 +0200
summary: fixes 38659: new roles should be manual by default
* By default, new roles are now maked as manual and not advanced
* When a role is moved from manual to automatic, permissions are now
recalculated
* Roles created in Initial Client and Org setup are kept as privileged
diffstat:
src-db/database/model/tables/AD_ROLE.xml | 4 ++--
src-db/database/model/triggers/AD_ROLE_TRG.xml | 5 +++--
src-db/database/sourcedata/AD_COLUMN.xml | 3 ++-
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 4 +++-
4 files changed, 10 insertions(+), 6 deletions(-)
diffs (84 lines):
diff -r df98c99a846d -r 5ae34663c033 src-db/database/model/tables/AD_ROLE.xml
--- a/src-db/database/model/tables/AD_ROLE.xml Thu May 31 09:29:11 2018 +0200
+++ b/src-db/database/model/tables/AD_ROLE.xml Wed May 30 13:03:45 2018 +0200
@@ -58,7 +58,7 @@
<onCreateDefault/>
</column>
<column name="ISMANUAL" primaryKey="false" required="false" type="CHAR"
size="1" autoIncrement="false">
- <default><![CDATA[N]]></default>
+ <default><![CDATA[Y]]></default>
<onCreateDefault/>
</column>
<column name="PROCESSING" primaryKey="false" required="false"
type="CHAR" size="1" autoIncrement="false">
@@ -70,7 +70,7 @@
<onCreateDefault/>
</column>
<column name="ISADVANCED" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
- <default><![CDATA[Y]]></default>
+ <default><![CDATA[N]]></default>
<onCreateDefault><![CDATA['Y']]></onCreateDefault>
</column>
<column name="ISRESTRICTBACKEND" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
diff -r df98c99a846d -r 5ae34663c033
src-db/database/model/triggers/AD_ROLE_TRG.xml
--- a/src-db/database/model/triggers/AD_ROLE_TRG.xml Thu May 31 09:29:11
2018 +0200
+++ b/src-db/database/model/triggers/AD_ROLE_TRG.xml Wed May 30 13:03:45
2018 +0200
@@ -17,7 +17,7 @@
* parts created by ComPiere are Copyright (C) ComPiere, Inc.;
* All Rights Reserved.
* Contributor(s): Openbravo SLU
-* Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
+* Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
*
* Specifically, this derivative work is based upon the following Compiere
* file and version.
@@ -37,7 +37,8 @@
IF (UPDATING) THEN
- IF NOT(COALESCE(:OLD.UserLevel,'.')<>COALESCE(:NEW.UserLevel,'.')) THEN
+ IF NOT((COALESCE(:OLD.UserLevel,'.') <> COALESCE(:NEW.UserLevel,'.'))
+ OR (:OLD.IsManual = 'Y' AND :NEW.IsManual='N')) THEN
RETURN;
END IF;
END IF;
diff -r df98c99a846d -r 5ae34663c033 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu May 31 09:29:11 2018 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed May 30 13:03:45 2018 +0200
@@ -126997,6 +126997,7 @@
<!--9593--> <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
<!--9593--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
<!--9593--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9593--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
<!--9593--> <ISKEY><![CDATA[N]]></ISKEY>
<!--9593--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--9593--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -295287,7 +295288,7 @@
<!--6C31A2B3095F4691895B92C158391497-->
<AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
<!--6C31A2B3095F4691895B92C158391497-->
<AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
<!--6C31A2B3095F4691895B92C158391497-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--6C31A2B3095F4691895B92C158391497-->
<DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--6C31A2B3095F4691895B92C158391497-->
<DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
<!--6C31A2B3095F4691895B92C158391497--> <ISKEY><![CDATA[N]]></ISKEY>
<!--6C31A2B3095F4691895B92C158391497--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--6C31A2B3095F4691895B92C158391497-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
diff -r df98c99a846d -r 5ae34663c033
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Thu May 31 09:29:11 2018 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Wed May 30 13:03:45 2018 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -594,6 +594,8 @@
newRole.setDescription(name);
newRole.setUserLevel(strUserLevel);
newRole.setClientAdmin(isClientAdmin);
+ newRole.setManual(false);
+ newRole.setAdvanced(true);
OBDal.getInstance().save(newRole);
OBDal.getInstance().flush();
return newRole;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
