From: drizea <danielrizea27@gmail.com>
Date: Mon, 13 Aug 2012 10:37:16 +0000 (+0300)
Subject: bug fix on place hold
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1040603bfe43097ebfa9bb796850345a22686bb8;p=working%2FEvergreen.git

bug fix on place hold
---

diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index c28797ecc5..38946439ba 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -43,6 +43,11 @@
     <string name="search_hint">What are you looking for?</string>
     <string name="advanced_search">Search</string>
     
+    <string name="loading_dialog_text"></string>
+    <string name="dialog_please_wait">Please wait</string>
+    <string name="dialog_fetching_data_message">Fetching data</string>
+    <string name="dialog_load_more_message">Load more data</string>
+    
     <string name="advanced_search_hint">Enter text here</string>
     <string name="advanced_search_add_filter_button">Add filter</string>
     <string name="advanced_search_filter_text">Added filters:</string>
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
index de90121af2..d24e465209 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
@@ -884,8 +884,8 @@ public class AccountAccess {
 	//if we can get hold ID then we return true
 		try{
 			
-			List<Integer> list= (List<Integer>)response;
-			if(list.get(0)>-1)
+			Integer id = Integer.parseInt(response.toString());
+			if(id >-1)
 				resp[0] = "true";
 				
 			
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
index 5d4e4edd64..a90064e04e 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
@@ -232,7 +232,7 @@ public class GlobalConfigs {
 
 				StringBuilder padding = new StringBuilder();
 				for(int j=0; j<organisations.get(i).level-1;j++)
-					padding.append("  ");
+					padding.append("   ");
 					
 				organisations.get(i).padding = padding.toString();
 			}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index 42a8ec373e..2af7e4dcad 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -205,8 +205,7 @@ public class SearchCatalogListView extends Activity {
 		searchOptionsMenu = findViewById(R.id.search_preference_options);
 
 		progressDialog = new ProgressDialog(context);
-
-		progressDialog.setMessage("Fetching data");
+		
 		// Set the ListView adapter
 		lv.setAdapter(adapter);
 
@@ -232,7 +231,7 @@ public class SearchCatalogListView extends Activity {
 						searchResultsNumber.setVisibility(View.VISIBLE);
 
 						progressDialog = ProgressDialog.show(context,
-								"Please wait", "Fetching data");
+								getResources().getText(R.string.dialog_please_wait), getResources().getText(R.string.dialog_fetching_data_message));
 					}
 				});
 
@@ -402,7 +401,7 @@ public class SearchCatalogListView extends Activity {
 						Log.d(TAG, "Load more data");
 						progressDialog = new ProgressDialog(context);
 
-						progressDialog.setMessage("Fetching data");
+						progressDialog.setMessage(getResources().getText(R.string.dialog_load_more_message));
 						progressDialog.show();
 
 						Thread searchThreadwithOffset = new Thread(
@@ -606,6 +605,7 @@ public class SearchCatalogListView extends Activity {
 
 			startActivity(intent);
 		}
+		break;
 		case BOOK_BAG: {
 
 			if (bookBags.size() > 0) {