summaryrefslogtreecommitdiffstats
path: root/idrop-web
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-02-25 15:29:14 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-02-25 15:29:14 (GMT)
commit9518297521a3730419ac93dc61e682a3a50c9116 (patch)
tree45704ded23d5e8fb0bc5b944f3d4b3acaaca2256 /idrop-web
parent8687916e4cf188bca01d4691703098df847e666b (diff)
downloadQCG-Data-9518297521a3730419ac93dc61e682a3a50c9116.zip
QCG-Data-9518297521a3730419ac93dc61e682a3a50c9116.tar.gz
QCG-Data-9518297521a3730419ac93dc61e682a3a50c9116.tar.bz2
[#1221] twistie broken on search results
Diffstat (limited to 'idrop-web')
-rwxr-xr-xidrop-web/grails-app/views/browse/dataObjectInfoMini.gsp2
-rw-r--r--idrop-web/release_notes.txt1
-rwxr-xr-xidrop-web/web-app/js/mydrop/lingo_common.js6
-rwxr-xr-xidrop-web/web-app/js/mydrop/main.js46
4 files changed, 53 insertions, 2 deletions
diff --git a/idrop-web/grails-app/views/browse/dataObjectInfoMini.gsp b/idrop-web/grails-app/views/browse/dataObjectInfoMini.gsp
index 906429f..2f16d8a 100755
--- a/idrop-web/grails-app/views/browse/dataObjectInfoMini.gsp
+++ b/idrop-web/grails-app/views/browse/dataObjectInfoMini.gsp
@@ -146,6 +146,8 @@ function updateTagsFromDataObjectInfoMini() {
updateTagsAtPath(absPathVal, infoTagsVal, infoCommentVal);
}
+</script>
+
<g:if test="${getThumbnail}">
<script>
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 288f3ac..9fbb267 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -44,6 +44,7 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1238] public link dialog shows up in wrong place
+*[#1221] twistie broken on search results
==Features==
diff --git a/idrop-web/web-app/js/mydrop/lingo_common.js b/idrop-web/web-app/js/mydrop/lingo_common.js
index 00140c4..3b74239 100755
--- a/idrop-web/web-app/js/mydrop/lingo_common.js
+++ b/idrop-web/web-app/js/mydrop/lingo_common.js
@@ -411,9 +411,11 @@ function lcSendValueWithParamsAndPlugHtmlInDiv(getUrl, params, resultDiv,
$.get(context + getUrl, params, function(data, status, xhr) {
var continueReq = checkForSessionTimeout(data, xhr);
- if (continueReq) {
- lcFillInDivWithHtml(data, resultDiv, postLoadFunction);
+ if (!continueReq) {
+ return false;
}
+
+ lcFillInDivWithHtml(data, resultDiv, postLoadFunction);
unblockPanel();
}, "html").error(function(xhr, status, error) {
$(resultDiv).html("");
diff --git a/idrop-web/web-app/js/mydrop/main.js b/idrop-web/web-app/js/mydrop/main.js
index 6807d91..79372c4 100755
--- a/idrop-web/web-app/js/mydrop/main.js
+++ b/idrop-web/web-app/js/mydrop/main.js
@@ -189,6 +189,52 @@ function showDefaultResourceDialog() {
}
+/**
+ * Linked to update tags button on info view, update the tags in iRODS
+ */
+function updateTags() {
+ var infoTagsVal = $("#infoTags").val();
+ var infoCommentVal = $("#infoComment").val();
+ var absPathVal = $("#infoAbsPath").val();
+
+ var params = {
+ absPath : absPathVal,
+ tags : infoTagsVal,
+ comment : infoCommentVal
+ }
+
+ showBlockingPanel();
+ lcSendValueViaPostAndCallbackHtmlAfterErrorCheck("/tags/updateTags",
+ params, null, "#infoUpdateArea", function() {
+ setMessage("Tags and comments updated successfully");
+ refreshTagCloud();
+ });
+ unblockPanel();
+}
+
+/**
+ * Linked to update tags button on info view, update the tags in iRODS
+ */
+function updateTagsAtPath(path, tags, comment) {
+
+ var params = {
+ absPath : path,
+ tags : tags,
+ comment : comment
+ }
+
+ showBlockingPanel();
+ lcSendValueViaPostAndCallbackHtmlAfterErrorCheck("/tags/updateTags",
+ params, null, null, function() {
+ setMessage("Tags and comments updated successfully");
+ refreshTagCloud();
+ });
+ unblockPanel();
+}
+
+
+
+