From 48155d0faa26d9eda5eaf0d2c0c92737cc4e8654 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Thu, 21 Jan 2010 15:06:12 +0000
Subject: [PATCH] [LMS-1303] fix: displaying internal properties
SVN: 14392
---
.../server/business/bo/common/IPropertyListingQuery.java | 2 +-
.../business/bo/common/PropertyTypeDataObjectBinding.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java
index d3259c7e900..50897cf0593 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java
@@ -33,7 +33,7 @@ public interface IPropertyListingQuery
* escaped.
*/
@Select(sql = "select pt.id as pt_id, pt.code as pt_code, dt.code as dt_code,"
- + " pt.label as pt_label, pt.is_managed_internally"
+ + " pt.label as pt_label, pt.is_internal_namespace"
+ " from property_types pt join data_types dt on pt.daty_id=dt.id", resultSetBinding = PropertyTypeDataObjectBinding.class)
public PropertyType[] getPropertyTypes();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
index e8be4577acd..9a551efae84 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
@@ -16,14 +16,13 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.CodeConverter;
/**
* A binding for the {@link IPropertyListingQuery#getPropertyTypes()} query.
*/
-public class PropertyTypeDataObjectBinding extends
- NonUpdateCapableDataObjectBinding<PropertyType>
+public class PropertyTypeDataObjectBinding extends NonUpdateCapableDataObjectBinding<PropertyType>
{
@Override
public void unmarshall(ResultSet row, PropertyType into) throws SQLException, EoDException
{
into.setId(row.getLong("pt_id"));
- into.setInternalNamespace(row.getBoolean("is_managed_internally"));
+ into.setInternalNamespace(row.getBoolean("is_internal_namespace"));
into.setSimpleCode(StringEscapeUtils.escapeHtml(row.getString("pt_code")));
into.setCode(StringEscapeUtils.escapeHtml(CodeConverter.tryToBusinessLayer(into
.getSimpleCode(), into.isInternalNamespace())));
--
GitLab