From c3b70bf99973a9769f065d3db75c5548c4bd6ffb Mon Sep 17 00:00:00 2001
From: "pooya.oa"
Date: Wed, 19 Jan 2022 11:28:51 +0100
Subject: [PATCH 1/2] added the function for setting the SMW target link
---
.../semantic_media_wiki/controllers/media_wiki.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/ckanext/semantic_media_wiki/controllers/media_wiki.py b/ckanext/semantic_media_wiki/controllers/media_wiki.py
index 5242f77..7b6d2d6 100644
--- a/ckanext/semantic_media_wiki/controllers/media_wiki.py
+++ b/ckanext/semantic_media_wiki/controllers/media_wiki.py
@@ -144,4 +144,16 @@ def cancel_dataset_plugin_is_enabled():
if Helper.check_plugin_enabled('cancel_dataset_creation'):
return True
return False
+
+
+ def get_smw_link():
+ ckan_root_path = toolkit.config.get('ckan.root_path')
+ if ckan_root_path and 'sfb1368/ckan' in ckan_root_path:
+ return ['1368', "https://service.tib.eu/sfb1368/wiki/Equipment", None]
+
+ elif ckan_root_path and 'sfb1153/ckan' in ckan_root_path:
+ return ['1153', "https://service.tib.eu/sfb1153/wiki/Tools", "https://service.tib.eu/sfb1153/wiki/Machines"]
+ else:
+ return ['1368', "https://service.tib.eu/sfb1368/wiki/Equipment", None]
+
From 020d46cc13e386caed0eb1890cad6ae90845236b Mon Sep 17 00:00:00 2001
From: "pooya.oa"
Date: Wed, 19 Jan 2022 11:36:53 +0100
Subject: [PATCH 2/2] added new buttons for smw 1153 adding tools/machines
---
ckanext/semantic_media_wiki/plugin.py | 3 ++-
.../public/statics/machines.js | 9 ---------
.../templates/add_machines.html | 15 +++++++++++++--
.../templates/edit_machines.html | 16 +++++++++++++---
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/ckanext/semantic_media_wiki/plugin.py b/ckanext/semantic_media_wiki/plugin.py
index e5e7643..66b6a60 100644
--- a/ckanext/semantic_media_wiki/plugin.py
+++ b/ckanext/semantic_media_wiki/plugin.py
@@ -68,4 +68,5 @@ def get_blueprint(self):
return blueprint
def get_helpers(self):
- return {'cancel_dataset_is_enabled': MediaWikiController.cancel_dataset_plugin_is_enabled}
+ return {'cancel_dataset_is_enabled': MediaWikiController.cancel_dataset_plugin_is_enabled,
+ 'get_smw_link': MediaWikiController.get_smw_link}
diff --git a/ckanext/semantic_media_wiki/public/statics/machines.js b/ckanext/semantic_media_wiki/public/statics/machines.js
index 558194b..bab314f 100644
--- a/ckanext/semantic_media_wiki/public/statics/machines.js
+++ b/ckanext/semantic_media_wiki/public/statics/machines.js
@@ -18,15 +18,6 @@ function formatState (state) {
};
$(document).ready(function(){
- let cUrl = window.location.pathname;
- console.info(cUrl);
- if (cUrl.includes('1368/ckan')){
- $('#add_new_machine_btn').attr('href', 'https://service.tib.eu/sfb1368/wiki/Equipment');
- }
- else{
- $('#add_new_machine_btn').attr('href', 'https://service.tib.eu/sfb1153/wiki/Equipment');
- }
-
$("select.machine_dropdown").select2({
formatResult: formatState
diff --git a/ckanext/semantic_media_wiki/templates/add_machines.html b/ckanext/semantic_media_wiki/templates/add_machines.html
index c2ac560..877b958 100644
--- a/ckanext/semantic_media_wiki/templates/add_machines.html
+++ b/ckanext/semantic_media_wiki/templates/add_machines.html
@@ -25,9 +25,20 @@ {{_('Please Select the Equipment(s) for this dataset')}}:
{{_('If you cannot find your Equipment, you can add it via the below button. Please refresh this page
if you add a new Equipment.')}}
-
+ {% set taget_smw_url = h.get_smw_link() %}
+ {% if taget_smw_url[0] == '1368' %}
+
{{_('Add New Equipment')}}
-
+
+ {% else %}
+
+ {{_('Add New Tool')}}
+
+
+ {{_('Add New Machine')}}
+
+ {% endif %}
+
{% set action = h.url_for('semantic_media_wiki.save_machines', _external=True) %}
diff --git a/ckanext/semantic_media_wiki/templates/edit_machines.html b/ckanext/semantic_media_wiki/templates/edit_machines.html
index 6b2d499..b371932 100644
--- a/ckanext/semantic_media_wiki/templates/edit_machines.html
+++ b/ckanext/semantic_media_wiki/templates/edit_machines.html
@@ -12,9 +12,19 @@
{{_('If you cannot find your Equipment, you can add it via the below button. Please refresh this page
if you add a new Equipment.')}}
-
- {{_('Add New Equipment')}}
-
+ {% set taget_smw_url = h.get_smw_link() %}
+ {% if taget_smw_url[0] == '1368' %}
+
+ {{_('Add New Equipment')}}
+
+ {% else %}
+
+ {{_('Add New Tool')}}
+
+
+ {{_('Add New Machine')}}
+
+ {% endif %}
{% set action = h.url_for('semantic_media_wiki.edit_save', _external=True) %}