[#1205] error accessing tickets (-80600) on srbbrick15

6 files changed, 56 insertions, 27 deletions

diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 2917329..1453a97 100755
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -183,7 +183,7 @@ log4j = {
 			'net.sf.ehcache.hibernate'
 
 	//info 'org.irods.mydrop'
-	warn 'org.irods.jargon'
+	debug 'org.irods.jargon'
 
 	warn 'org.irods.jargon.spring.security'
 	warn 'org.springframework'
diff --git a/idrop-web/grails-app/views/layouts/mainNoSidebar.gsp b/idrop-web/grails-app/views/layouts/mainNoSidebar.gsp
index f3bd869..dc397f8 100755
--- a/idrop-web/grails-app/views/layouts/mainNoSidebar.gsp
+++ b/idrop-web/grails-app/views/layouts/mainNoSidebar.gsp
@@ -29,7 +29,7 @@
 
                     jQuery.i18n.properties({
                               name:'messages', 
-                              path:'js/bundles/', 
+                              path:context + '/js/bundles/', 
                               mode:'both'
                           });
 		  
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 22a4892..6541a21 100755
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -18,7 +18,10 @@ Note that the following bug and feature requests are logged in GForge with relat
 
 ==Bug Fixes==
 
-* [#1181] fix memory in idrop web2 when changing login
+*[#1181] fix memory in idrop web2 when changing login
+
+*[#1205] error accessing tickets (-80600) on srbbrick15
+**more gracefully handle ticket errors in display
 
 ==Features==
 
diff --git a/idrop-web/web-app/js/bundles/messages.properties b/idrop-web/web-app/js/bundles/messages.properties
index b47b976..2218e52 100755
--- a/idrop-web/web-app/js/bundles/messages.properties
+++ b/idrop-web/web-app/js/bundles/messages.properties
@@ -1,22 +1,21 @@
-# This line is ignored by the plugin
-msg_hello = Hello
-msg_world = World
-msg_complex = Good morning {0}!
-msg_delete_selected_file=Delete selected file?
-msg_delete_share=Delete the share?  Note that permissions will remain, but the share will not appear in the user's home page
-msg_file_deleted=File deleted
-msg_file_starred=File starred
-msg_file_unstarred=File unstarred
+msg_ticket_error = Tickets do not seem to be supported on this server
 msg_action_missing = No action provided
-msg.path.missing = No file selected
+msg_confirm_delete = Delete selected items?
+msg_complex = Good morning {0}!
+msg_delete_successful = Delete successful
+msg_delete_selected_file = Delete selected file?
+msg_delete_share = Delete the share?  Note that permissions will remain, but the share will not appear in the user's home page
+msg_file_deleted = File deleted
+msg_file_starred = File starred
+msg_file_unstarred = File unstarred
+msg_path_missing = No file selected
 msg_password_no_data = No password data found
 msg_password_successful = Password change successful
 msg_ticket_update_successful = Ticket update successful
-msg_ticket_no_data = Error - No ticket data found
+msg_ticket_no_data = No ticket data found
 msg_upload_complete = Upload complete
 msg_nothing_selected_for_edit = Nothing was selected for editing
-msg_confirm_delete = Delete selected items?
-msg_delete_successful = Delete successful
-msg_resource_changed = Resource changed successfully
-msg_search_missing=Search term missing
 msg_profile_update_successful = Profile update successful
+msg_resource_changed = Resource changed successfully
+msg_search_missing = Search term missing
+
diff --git a/idrop-web/web-app/js/mydrop/lingo_common.js b/idrop-web/web-app/js/mydrop/lingo_common.js
index 137aa89..c633cfd 100755
--- a/idrop-web/web-app/js/mydrop/lingo_common.js
+++ b/idrop-web/web-app/js/mydrop/lingo_common.js
@@ -31,6 +31,29 @@ function checkForSessionTimeout(data, xhr) {
 }
 
 /**
+ * Display the given text as an html alert div inside the given selector
+ * @param message
+ * @param targetDiv
+ * @returns {Boolean}
+ */
+function displayMessageAsBootstrapAlert(message, targetDiv) {
+	
+	if (message == null || message == "") {
+		message = "Unknown message, please specify";
+	}
+	
+	if (targetDiv == null || targetDiv == "") {
+		return false;
+	}
+	
+	var divTag = document.createElement("div");
+	$(divTag).addClass('alert');
+	$(divTag).html(message);
+	$(targetDiv).html(divTag);
+	
+}
+
+/**
  * FIXME: remove..this is dumb check HTML coming back from an AJAX call for an
  * indication of an error, and if an error is found, then set the message in the
  * div using the given id. Then the appropriate exception will be thrown.
diff --git a/idrop-web/web-app/js/mydrop/ticket.js b/idrop-web/web-app/js/mydrop/ticket.js
index f19aaff..1ca26f1 100755
--- a/idrop-web/web-app/js/mydrop/ticket.js
+++ b/idrop-web/web-app/js/mydrop/ticket.js
@@ -30,14 +30,18 @@ function reloadTicketTable(absPath) {
 	var jqxhr = $.get(context + ticketTableUrl, params,
 			function(data, status, xhr) {
 				$('#ticketTableDiv').html(data);
-			}, "html").error(function(xhr, status, error) {
-		setErrorMessage(xhr.responseText);
-	}).success(function(data, status, xhr) {
-		var continueReq = checkForSessionTimeout(data, xhr);
-		if (!continueReq) {
-			return false;
-		}
-		buildTicketTableInPlace();
+			}, "html")
+			.error(function(xhr, status, error) {
+				var message = jQuery.i18n.prop('msg_ticket_error');
+				displayMessageAsBootstrapAlert(message, "#infoAccordionTicketsInner");
+				 setErrorMessage(xhr.responseText);
+			}).success(function(data, status, xhr) {
+				var continueReq = checkForSessionTimeout(data, xhr);
+				if (!continueReq) {
+					return false;
+					buildTicketTableInPlace();
+			}
+			
 	});
 	
 }
@@ -149,7 +153,7 @@ function reloadTickets() {
 }
 
 /**
- * Show ticket details dailog area
+ * Show ticket details dialog area
  * 
  * @param create -
  *            is this a create or edit