midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-581 Store divider location for window per user / DetailHeight must be user preferences - found DetailCollapsed preference was also implemented as general client preference in IDEMPIERE-369

This commit is contained in:
Carlos Ruiz 2015-04-22 10:07:35 -05:00
parent bae1c3c0f2
commit 259d9156e1
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/i2.1/oracle/201504220959_IDEMPIERE-581.sql Normal file
View File

@ -0,0 +1,6 @@
delete from ad_preference where ad_user_id is null and (attribute like '%|DetailPane.Height' or attribute like '%|DetailPane.IsOpen')
;
SELECT register_migration_script('201504220959_IDEMPIERE-581.sql') FROM dual
;

6
migration/i2.1/postgresql/201504220959_IDEMPIERE-581.sql Normal file
View File

@ -0,0 +1,6 @@
delete from ad_preference where ad_user_id is null and (attribute like '%|DetailPane.Height' or attribute like '%|DetailPane.IsOpen')
;
SELECT register_migration_script('201504220959_IDEMPIERE-581.sql') FROM dual
;

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -1104,19 +1104,19 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
int windowId = getGridTab().getAD_Window_ID(); int windowId = getGridTab().getAD_Window_ID();
int adTabId = getGridTab().getAD_Tab_ID(); int adTabId = getGridTab().getAD_Tab_ID();
if (windowId > 0 && adTabId > 0) { if (windowId > 0 && adTabId > 0) {
Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), I_AD_Preference.Table_ID), "AD_Window_ID=? AND Attribute=? AND AD_Process_ID IS NULL AND PreferenceFor = 'W'", null); Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), I_AD_Preference.Table_ID), "AD_Window_ID=? AND Attribute=? AND AD_User_ID=? AND AD_Process_ID IS NULL AND PreferenceFor = 'W'", null);
int userId = Env.getAD_User_ID(Env.getCtx());
MPreference preference = query.setOnlyActiveRecords(true) MPreference preference = query.setOnlyActiveRecords(true)
.setApplyAccessFilter(true) .setApplyAccessFilter(true)
.setParameters(windowId, adTabId+"|DetailPane.IsOpen") .setParameters(windowId, adTabId+"|DetailPane.IsOpen", userId)
.first(); .first();
if (preference != null && preference.getAD_Preference_ID() > 0) { if (preference == null || preference.getAD_Preference_ID() <= 0) {
preference.setValue(value ? "Y" : "N");
} else {
preference = new MPreference(Env.getCtx(), 0, null); preference = new MPreference(Env.getCtx(), 0, null);
preference.setAD_Window_ID(windowId); preference.setAD_Window_ID(windowId);
preference.setAD_User_ID(userId);
preference.setAttribute(adTabId+"|DetailPane.IsOpen"); preference.setAttribute(adTabId+"|DetailPane.IsOpen");
preference.setValue(value ? "Y" : "N");
} }
preference.setValue(value ? "Y" : "N");
preference.saveEx(); preference.saveEx();
//update current context //update current context
Env.getCtx().setProperty("P"+windowId+"|"+adTabId+"|DetailPane.IsOpen", value ? "Y" : "N"); Env.getCtx().setProperty("P"+windowId+"|"+adTabId+"|DetailPane.IsOpen", value ? "Y" : "N");
@ -1738,14 +1738,16 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
int windowId = getGridTab().getAD_Window_ID(); int windowId = getGridTab().getAD_Window_ID();
int adTabId = getGridTab().getAD_Tab_ID(); int adTabId = getGridTab().getAD_Tab_ID();
if (windowId > 0 && adTabId > 0) { if (windowId > 0 && adTabId > 0) {
Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), I_AD_Preference.Table_ID), "AD_Window_ID=? AND Attribute=? AND AD_Process_ID IS NULL AND PreferenceFor = 'W'", null); Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), I_AD_Preference.Table_ID), "AD_Window_ID=? AND Attribute=? AND AD_User_ID=? AND AD_Process_ID IS NULL AND PreferenceFor = 'W'", null);
int userId = Env.getAD_User_ID(Env.getCtx());
MPreference preference = query.setOnlyActiveRecords(true) MPreference preference = query.setOnlyActiveRecords(true)
.setApplyAccessFilter(true) .setApplyAccessFilter(true)
.setParameters(windowId, adTabId+"|DetailPane.Height") .setParameters(windowId, adTabId+"|DetailPane.Height", userId)
.first(); .first();
if (preference == null || preference.getAD_Preference_ID() <= 0) { if (preference == null || preference.getAD_Preference_ID() <= 0) {
preference = new MPreference(Env.getCtx(), 0, null); preference = new MPreference(Env.getCtx(), 0, null);
preference.setAD_Window_ID(windowId); preference.setAD_Window_ID(windowId);
preference.setAD_User_ID(userId);
preference.setAttribute(adTabId+"|DetailPane.Height"); preference.setAttribute(adTabId+"|DetailPane.Height");
} }
preference.setValue(height); preference.setValue(height);