From 2cc0de54f59a5bd6037b250797cea8fe767ac798 Mon Sep 17 00:00:00 2001
From: "Mark M. Florida" <markflorida@wustl.edu>
Date: Fri, 22 Jul 2016 10:51:58 -0500
Subject: [PATCH] XNAT-4332: hidden input was added to make sure receiver ID is
included in form submission.
---
.../META-INF/xnat/spawner/site-admin-elements.yaml | 7 +++----
src/main/webapp/scripts/xnat/admin/dicomScpManager.js | 6 +++---
src/main/webapp/scripts/xnat/ui/panel.js | 5 +++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index c5df1de1..d0830b1b 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
@@ -1173,11 +1173,10 @@ dicomScpReceivers:
contentType: json
contents:
scpId:
- kind: panel.input.text
+ kind: panel.input.hidden
id: scp-id
- name: scpId
- label: SCP ID
- validation: required
+ name: id
+ className: hidden
aeTitle:
kind: panel.input.text
id: scp-title
diff --git a/src/main/webapp/scripts/xnat/admin/dicomScpManager.js b/src/main/webapp/scripts/xnat/admin/dicomScpManager.js
index 73c806f3..d2131a1e 100644
--- a/src/main/webapp/scripts/xnat/admin/dicomScpManager.js
+++ b/src/main/webapp/scripts/xnat/admin/dicomScpManager.js
@@ -229,7 +229,7 @@ var XNAT = getObject(XNAT || {});
return spawn('a.link|href=#!', {
onclick: function(e){
e.preventDefault();
- dicomScpManager.dialog(item);
+ dicomScpManager.dialog(item, false);
}
}, [['b', text]]);
}
@@ -238,7 +238,7 @@ var XNAT = getObject(XNAT || {});
return spawn('button.btn.sm.edit', {
onclick: function(e){
e.preventDefault();
- dicomScpManager.dialog(item);
+ dicomScpManager.dialog(item, false);
}
}, 'Edit');
}
@@ -258,7 +258,7 @@ var XNAT = getObject(XNAT || {});
url: scpUrl(item.id),
success: function(){
console.log('"'+ item.aeTitle + '" deleted');
- XNAT.ui.banner.top(2000, '<b>"'+ item.aeTitle + '"</b> deleted.', 'success');
+ XNAT.ui.banner.top(1000, '<b>"'+ item.aeTitle + '"</b> deleted.', 'success');
refreshTable();
}
});
diff --git a/src/main/webapp/scripts/xnat/ui/panel.js b/src/main/webapp/scripts/xnat/ui/panel.js
index 1a5ee638..ab9c2a33 100644
--- a/src/main/webapp/scripts/xnat/ui/panel.js
+++ b/src/main/webapp/scripts/xnat/ui/panel.js
@@ -746,13 +746,14 @@ var XNAT = getObject(XNAT || {});
opts.type = 'hidden';
opts.element = extend(true, {
type: 'hidden',
- className: opts.className || opts.classes,
- addClass: 'hidden',
+ className: opts.className || opts.classes || '',
name: opts.name,
id: opts.id || toDashed(opts.name),
value: opts.value || ''
}, opts.element);
+ addClassName(opts.element, 'hidden');
+
if (opts.validation || opts.validate) {
extend(true, opts.element, {
data: {
--
GitLab