From dd677b6deabd6e4cfd973e09675ed51d2044dc50 Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch>
Date: Tue, 3 Sep 2019 10:43:11 +0200
Subject: [PATCH] SSDM-8592 : Using the new feature

---
 .../eln-lims/1/as/initialize-master-data.py   |  10 ----------
 .../eln-lims/1/as/master-data/data-model.xls  | Bin 73728 -> 74752 bytes
 2 files changed, 10 deletions(-)

diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py
index 078f2ae70ba..7bb0dbf5593 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/initialize-master-data.py
@@ -16,7 +16,6 @@
 # MasterDataRegistrationTransaction Class
 from ch.ethz.sis.openbis.generic.server.asapi.v3 import ApplicationServerApi
 from ch.systemsx.cisd.openbis.generic.server import CommonServiceProvider
-from ch.systemsx.cisd.openbis.generic.server import ComponentNames
 from ch.ethz.sis.openbis.generic.asapi.v3.dto.service.id import CustomASServiceCode
 from ch.ethz.sis.openbis.generic.asapi.v3.dto.service import CustomASServiceExecutionOptions
 from ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl import MasterDataRegistrationHelper
@@ -29,15 +28,6 @@ props = CustomASServiceExecutionOptions().withParameter('xls', helper.listXlsByt
     .withParameter('xls_name', 'ELN-LIMS').withParameter('update_mode', 'IGNORE_EXISTING')\
     .withParameter('scripts', helper.getAllScripts())
 result = api.executeCustomASService(sessionToken, CustomASServiceCode("xls-import-api"), props);
-# Updating MULTILINE_VARCHAR to use "Word Processor" for all Properties
-daoFactory = CommonServiceProvider.getApplicationContext().getBean(ComponentNames.DAO_FACTORY);
-currentSession = daoFactory.getSessionFactory().getCurrentSession();
-SQL = "UPDATE property_types SET meta_data = cast(:meta_data AS jsonb) WHERE id IN (SELECT id FROM property_types WHERE daty_id = (SELECT id FROM data_types WHERE code = 'MULTILINE_VARCHAR'))";
-meta_data = "{ \"custom_widget\" : \"Word Processor\" }";
-sqlQuery = currentSession.createSQLQuery(SQL);
-sqlQuery.setParameter("meta_data", meta_data);
-sqlQuery.executeUpdate();
-#
 print("======================== master-data xls ingestion result ========================")
 print(result)
 print("======================== master-data xls ingestion result ========================")
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/master-data/data-model.xls
index c061f53d70d87bbbb9cf15446655855d2d1bf0ce..16332eb71f3a9ddbf34d818a04319e5fb81200c1 100644
GIT binary patch
delta 6608
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
HuBZMFQ{y&~

delta 5589
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

-- 
GitLab