summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael_conway@unc.edu>2013-06-07 17:56:19 (GMT)
committer mconway <michael_conway@unc.edu>2013-06-07 17:56:19 (GMT)
commit16d1c607a44e780362ebfbd27e05b65bf4435c47 (patch)
tree9b45afe2ec47ef154d3603d43e338af3c3329bfb
parent06a7e389f67cfdf117bce572bd7bb0395e58d5ed (diff)
downloadQCG-Data-16d1c607a44e780362ebfbd27e05b65bf4435c47.zip
QCG-Data-16d1c607a44e780362ebfbd27e05b65bf4435c47.tar.gz
QCG-Data-16d1c607a44e780362ebfbd27e05b65bf4435c47.tar.bz2
[#1475] ie fixes
-rwxr-xr-xidrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy42
-rwxr-xr-xidrop-web/grails-app/i18n/messages.properties3
-rw-r--r--idrop-web/release_notes.txt4
-rw-r--r--idrop-web/web-app/js/mydrop/home.js2
4 files changed, 34 insertions, 17 deletions
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
index 99bf173..9b74887 100755
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
@@ -348,26 +348,36 @@ class BrowseController {
}
def collectionAndDataObjectListAndSearchAO = irodsAccessObjectFactory.getCollectionAndDataObjectListAndSearchAO(irodsAccount)
- def collectionAndDataObjectList = collectionAndDataObjectListAndSearchAO.listDataObjectsAndCollectionsUnderPath(parent)
- log.debug("retrieved collectionAndDataObjectList: ${collectionAndDataObjectList}")
- collectionAndDataObjectList.each {
+ try {
- if (it.isDataObject()) {
- icon = "../images/file.png"
- state = "open"
- type = "file"
- } else {
- icon = "folder"
- state = "closed"
- type = "folder"
- }
+ def collectionAndDataObjectList = collectionAndDataObjectListAndSearchAO.listDataObjectsAndCollectionsUnderPath(parent)
+ log.debug("retrieved collectionAndDataObjectList: ${collectionAndDataObjectList}")
+ collectionAndDataObjectList.each {
- def attrBuf = ["id":it.formattedAbsolutePath, "rel":type, "absPath":it.formattedAbsolutePath]
- jsonBuff.add(
- ["data": it.nodeLabelDisplayValue,"attr":attrBuf, "state":state,"icon":icon, "type":type]
- )
+ if (it.isDataObject()) {
+ icon = "../images/file.png"
+ state = "open"
+ type = "file"
+ } else {
+ icon = "folder"
+ state = "closed"
+ type = "folder"
+ }
+
+ def attrBuf = ["id":it.formattedAbsolutePath, "rel":type, "absPath":it.formattedAbsolutePath]
+
+ jsonBuff.add(
+ ["data": it.nodeLabelDisplayValue,"attr":attrBuf, "state":state,"icon":icon, "type":type]
+ )
+ }
+ } catch (ZoneUnavailableException e) {
+ log.error("zone unavailable exception", e)
+ response.sendError(500, message(code:"message.zone.unavailable"))
+ } catch (JargonException e) {
+ log.error("jargon exception", e)
+ response.sendError(500, e.message)
}
} else {
throw new JargonException("invalid path type:${pathType}")
diff --git a/idrop-web/grails-app/i18n/messages.properties b/idrop-web/grails-app/i18n/messages.properties
index 6639196..ee59e36 100755
--- a/idrop-web/grails-app/i18n/messages.properties
+++ b/idrop-web/grails-app/i18n/messages.properties
@@ -227,6 +227,9 @@ message.no.support.specific.query=Nothing to display! Sharing and starring supp
message.share.delete.successful=Delete of share successful, note that permissions still remain as defined before
message.update.share.successful=Update of share successful
+message.zone.unavailable=Zone is unavailable, it may be down
+
+
# validation errors
org.irods.mydrop.controller.AddMetadataCommand.attribute.blank.error.attribute=Attribute must be entered
org.irods.mydrop.controller.AddMetadataCommand.value.blank.error.value=Value must be entered
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 13279dc..101915f 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -52,6 +52,10 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1462] Fix profile to tolerate no 'protected profile read/write' group, it will still write the profile but will not set permissions to that missing group
+*[#1475] ie fixes for 2.0.1
+**Lots of cleanups of html and styles as a result of ie testing on win8
+**Fix of login screen rendering on ie
+
==Features==
*[#984] iDrop web '2.0' redesign effort
diff --git a/idrop-web/web-app/js/mydrop/home.js b/idrop-web/web-app/js/mydrop/home.js
index ec15fd4..9010d18 100644
--- a/idrop-web/web-app/js/mydrop/home.js
+++ b/idrop-web/web-app/js/mydrop/home.js
@@ -149,7 +149,7 @@ function browserFirstViewRetrieved(data) {
|| n.statusText == "OK") {
// ok
} else {
- setMessage("Unable to browse to location, try refreshing the tree. You may not have permission to view this directory");
+ setMessage(n.responseText);
return false;
// refreshTree();
}