summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-06-11 12:23:58 (GMT)
committer mconway <michael_conway@unc.edu>2013-06-11 12:23:58 (GMT)
commitec6d757c19a4efc9e2984fa4cbe34676b93ce893 (patch)
tree44fe54eece1a672b8d9ecf759144c29e1f026200
parent16d1c607a44e780362ebfbd27e05b65bf4435c47 (diff)
downloadQCG-Data-ec6d757c19a4efc9e2984fa4cbe34676b93ce893.zip
QCG-Data-ec6d757c19a4efc9e2984fa4cbe34676b93ce893.tar.gz
QCG-Data-ec6d757c19a4efc9e2984fa4cbe34676b93ce893.tar.bz2
[#1475] sharing panel not showing
-rw-r--r--idrop-web/grails-app/views/sharing/_sharingPanel.gsp2
-rwxr-xr-xidrop-web/grails-app/views/sharing/aclDetails.gsp6
-rw-r--r--idrop-web/web-app/js/mydrop/home.js4
3 files changed, 7 insertions, 5 deletions
diff --git a/idrop-web/grails-app/views/sharing/_sharingPanel.gsp b/idrop-web/grails-app/views/sharing/_sharingPanel.gsp
index 6a3a4e5..8407cea 100644
--- a/idrop-web/grails-app/views/sharing/_sharingPanel.gsp
+++ b/idrop-web/grails-app/views/sharing/_sharingPanel.gsp
@@ -15,7 +15,7 @@
<div class="btn-group">
<g:if
test="${grailsApplication.config.idrop.config.use.sharing==true && irodsSharedFileOrCollection != null}">
- <button onclick="editShareAtPath()">
+ <button type="button" onclick="editShareAtPath()">
<g:message code="text.edit.share" />
</button>
<button onclick="removeShareAtPath()">
diff --git a/idrop-web/grails-app/views/sharing/aclDetails.gsp b/idrop-web/grails-app/views/sharing/aclDetails.gsp
index 1c082eb..185424e 100755
--- a/idrop-web/grails-app/views/sharing/aclDetails.gsp
+++ b/idrop-web/grails-app/views/sharing/aclDetails.gsp
@@ -15,13 +15,13 @@
<div class="btn-group">
<button type="button" id="addAclButton"
value="addAcl"
- onclick="prepareAclDialog()")><g:message code="default.button.create.label" /></button>
+ onclick="prepareAclDialog()"><g:message code="default.button.create.label" /></button>
<button type="button" id="deleteAclButton"
value="deleteAcl"
- onclick="deleteAcl()")><g:message code="default.button.delete.label" /></button>
+ onclick="deleteAcl()"> <g:message code="default.button.delete.label" /> </button>
<button type="button" id="reloadAclButton"
value="reloadAcl"
- onclick="reloadAclTable(selectedPath)")><g:message code="default.button.reload.label" /></button>
+ onclick="reloadAclTable(selectedPath)"><g:message code="default.button.reload.label" /></button>
</div>
<div class="btn-group">
<button onclick="makePublicLinkAtPath()"><g:message code="text.create.public.link" /></button>
diff --git a/idrop-web/web-app/js/mydrop/home.js b/idrop-web/web-app/js/mydrop/home.js
index 9010d18..4055338 100644
--- a/idrop-web/web-app/js/mydrop/home.js
+++ b/idrop-web/web-app/js/mydrop/home.js
@@ -2656,7 +2656,9 @@ function addShareAtPath() {
function editShareAtPath() {
$("#sharingPanelContainingDiv").html();
var path = $("#infoAbsPath").val();
- if (selectedPath == null) {
+ if (path == null) {
+ setMessage(jQuery.i18n.prop('msg_path_missing'));
+ unblockPanel();
return false;
}