details: /erp/devel/pi/rev/d3fedbfe5ff9
changeset: 10250:d3fedbfe5ff9
user: rafaeldemiguel <rdm <at> openbravo.com>
date: Mon Jan 31 09:46:53 2011 +0100
summary: Fixes issue 15345 15211 : Widget are logically deleted
details: /erp/devel/pi/rev/f73c61dfdc07
changeset: 10251:f73c61dfdc07
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Jan 31 11:16:23 2011 +0100
summary: [OBCQL] Open links using new openDirectView function.
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 5 ++
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
| 7 ++-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
| 2 +-
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
| 25 +---------
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
| 11 +---
5 files changed, 16 insertions(+), 34 deletions(-)
diffs (111 lines):
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Mon Jan 31 11:16:23 2011 +0100
@@ -177,8 +177,13 @@
}
static List<WidgetInstance> getUserWidgetInstances() {
+ return getUserWidgetInstances(true);
+ }
+
+ static List<WidgetInstance> getUserWidgetInstances(Boolean isActive) {
OBCriteria<WidgetInstance> obc =
OBDal.getInstance().createCriteria(WidgetInstance.class);
obc.setFilterOnReadableClients(false);
+ obc.setFilterOnActive(isActive);
obc.add(Expression.eq(WidgetInstance.PROPERTY_CLIENT,
OBDal.getInstance().get(Client.class,
OBContext.getOBContext().getCurrentClient().getId())));
obc.add(Expression.eq(WidgetInstance.PROPERTY_VISIBLEATROLE,
OBDal.getInstance().get(
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Mon Jan 31 11:16:23 2011 +0100
@@ -293,7 +293,12 @@
// Removed widget instance to delete.
for (WidgetInstance widgetInstance : currentWidgetInstances) {
log.debug(">> removed widget instance: " + widgetInstance.getId());
- OBDal.getInstance().remove(widgetInstance);
+ if (widgetInstance.getCopiedFrom() != null) {
+ widgetInstance.setActive(Boolean.FALSE);
+ OBDal.getInstance().save(widgetInstance);
+ } else {
+ OBDal.getInstance().remove(widgetInstance);
+ }
}
hasRemovedInstances = true;
}
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Mon Jan 31 11:16:23 2011 +0100
@@ -241,7 +241,7 @@
private void copyWidgets() {
final List<WidgetInstance> userWidgets = new
ArrayList<WidgetInstance>(MyOBUtils
- .getUserWidgetInstances());
+ .getUserWidgetInstances(false));
final User user = OBDal.getInstance().get(User.class,
OBContext.getOBContext().getUser().getId());
final Role role = OBDal.getInstance().get(Role.class,
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
Mon Jan 31 11:16:23 2011 +0100
@@ -35,11 +35,8 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
-import org.openbravo.data.Sqlc;
-import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.domain.Reference;
import org.openbravo.model.ad.ui.Tab;
-import org.openbravo.model.ad.ui.WindowTrl;
class QueryListUtils {
private static final Logger log = Logger.getLogger(QueryListUtils.class);
@@ -74,26 +71,8 @@
field.put("OB_TabId", tab.getId());
field.put("OB_WindowId", tab.getWindow().getId());
-
- final String userLanguageId =
OBContext.getOBContext().getLanguage().getId();
- String tabTitle = null;
- for (WindowTrl windowTrl : tab.getWindow().getADWindowTrlList()) {
- final String trlLanguageId = (String)
DalUtil.getId(windowTrl.getLanguage());
- if (trlLanguageId.equals(userLanguageId)) {
- tabTitle = windowTrl.getName();
- }
- }
- if (tabTitle == null) {
- tabTitle = tab.getWindow().getName();
- }
-
- field.put("OB_WindowTitle", tabTitle);
- field.put("OB_keyParameter", "inp"
- +
Sqlc.TransformaNombreColumna(entity.getIdProperties().get(0).getColumnName()));
- // find the model object mapping
- String mappingName = Utility.getTabURL(tab.getId(), "E", false);
- field.put("OB_mappingName", mappingName);
-
+ field.put("OB_keyColumnName",
entity.getIdProperties().get(0).getColumnName());
+ field.put("OB_entityName", entity.getName());
}
// Summarize option:
diff -r 60e11183dca4 -r f73c61dfdc07
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
---
a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Mon Jan 31 10:07:43 2011 +0100
+++
b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
Mon Jan 31 11:16:23 2011 +0100
@@ -245,15 +245,8 @@
var field = this.getField(colNum);
if (field.isLink) {
if (field.OB_TabId && field.OB_LinkExpression) {
- OB.Layout.ViewManager.openView('OBClassicWindow', {
- tabId: field.OB_TabId,
- recordId: record[field.OB_LinkExpression],
- windowId: field.OB_WindowId,
- command: 'DIRECT',
- tabTitle: field.OB_WindowTitle,
- mappingName: field.OB_mappingName,
- keyParameter: field.OB_keyParameter
- });
+ OB.Utilities.openDirectView(field.OB_WindowId, field.OB_keyColumnName,
+ field.OB_entityName, record[field.OB_LinkExpression]);
}
}
},
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
