From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Mon, 10 Sep 2012 16:35:43 +0000 (-0400)
Subject: Fix broken display of verification attempt in progress
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6843120d4ef28c4859853e2e402e4171c2092a91;p=evergreen%2Fequinox.git

Fix broken display of verification attempt in progress

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---

diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
index bcea31a909..1c479dad71 100644
--- a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
@@ -51,7 +51,6 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
          * terms
          */
 
-        module.clear_attempt_display();
         module.progress_dialog.attr("title", localeStrings.VERIFICATION_DIALOG);
         module.progress_dialog.show();
 
@@ -71,8 +70,14 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
                         });
 
                         if (r.attempt) {
-                            module.update_attempt_display(r.attempt);
                             module.attempt = r.attempt;
+                            module.progress_dialog.show(
+                                false,
+                                dojo.string.substitute(
+                                    localeStrings.VERIFICATION_ATTEMPT_ID,
+                                    [r.attempt.id()]
+                                )
+                            );
                         }
                     }
                 },
@@ -89,38 +94,6 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
         )
     };
 
-    module.clear_attempt_display = function() {
-        dojo.empty(dojo.byId("url-verify-attempt-id"));
-        dojo.empty(dojo.byId("url-verify-attempt-start"));
-        dojo.empty(dojo.byId("url-verify-attempt-finish"));
-    };
-
-    /* This gives the user a way to know the verification attempt
-     * information for the theoretical purposes of restarting it
-     * later, although we don't give them a way to do that yet, and
-     * when we do, it really shouldn't involve the user remembering
-     * an ID number. */
-    module.update_attempt_display = function(attempt) {
-        dojo.byId("url-verify-attempt-id").innerHTML =
-            dojo.string.substitute(
-                localeStrings.VERIFICATION_ATTEMPT_ID,
-                [attempt.id()]
-            );
-        dojo.byId("url-verify-attempt-start").innerHTML =
-            dojo.string.substitute(
-                localeStrings.VERIFICATION_ATTEMPT_START,
-                [attempt.start_time()]
-            );
-
-        if (attempt.finish_time()) {
-            dojo.byId("url-verify-attempt-finish").innerHTML =
-                dojo.string.substitute(
-                    localeStrings.VERIFICATION_ATTEMPT_FINISH,
-                    [attempt.finish_time()]
-                );
-        }
-    };
-
 }());
 
 }
diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js b/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
index 74f1b6ab58..16a8cf3326 100644
--- a/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/nls/URLVerify.js
@@ -9,7 +9,5 @@
     "VERIFY_ALL": "Click 'OK' to verify ALL the URLs found in this session.  Click 'Cancel' if the selected, visible URLs are the only ones you want verified.",
     "VERIFICATION_DIALOG": "Verifying URLs ...",
     "VERIFICATION_ATTEMPT_ID": "Verification attempt ID: ${0}",
-    "VERIFICATION_ATTEMPT_START": "Attempt start time: ${0}",
-    "VERIFICATION_ATTEMPT_FINISH": "Attempt finish time: ${0}",
     "NOTHING_SELECTED": "No rows are selected, so no action will be taken."
 }