From 9d4f224de400f2dcc71f9a4adfa79cbca44d6286 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Mon, 31 May 2010 09:02:53 +0000
Subject: [PATCH] [LMS-1561] Dissapearing custom columns of Predefined Queries
SVN: 16212
---
.../web/client/application/module/QueryViewer.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
index c129253754c..68dbc3933d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
@@ -100,7 +100,7 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
}
AsyncCallback<TableModelReference> callback =
ReportGeneratedCallback.create(viewContext.getCommonViewContext(),
- createReportInformationProvider(sqlQueryOrNull),
+ createReportInformationProvider(sqlQueryOrNull, queryIdOrNull),
createDisplayQueryResultsAction());
if (queryIdOrNull != null)
{
@@ -123,7 +123,8 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
queryProvider.update(observedModifications);
}
- private IReportInformationProvider createReportInformationProvider(final String sqlQuery)
+ private IReportInformationProvider createReportInformationProvider(final String sqlQuery,
+ final Long queryIdOrNull)
{
return new IReportInformationProvider()
{
@@ -135,6 +136,10 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
public String getKey()
{
+ if (queryIdOrNull != null)
+ {
+ return queryIdOrNull.toString();
+ }
if (sqlQuery == null)
{
return "null";
--
GitLab