Corrections to the preceding commit

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

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
index 4b4e3ba..ea1e4f7 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
@@ -83,12 +83,8 @@ sub verify_session {
             select => {uvu => ['id']},
             from => {
                 uvu => { # url
-                    cbrebi => { # bucket item
-                        join => { cbreb => { # bucket
-                            join => { uvs => { # session
-                                filter => {id => $session_id}
-                            }}
-                        }}
+                    uvs => { # session
+                        filter => {id => $session_id}
                     }
                 }
             }

diff --git a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
index bd7b733..3023937 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
+++ b/Open-ILS/web/js/dojo/openils/URLVerify/SelectURLs.js
@@ -72,10 +72,10 @@ if (!dojo._hasResource["openils.URLVerify.SelectURLs"]) {
                     }
                 },
                 "oncomplete": function() {
+                    module.progress_dialog.show(true);
                     module.progress_dialog.attr(
                         "title", localeStrings.REDIRECTING
                     );
-                    module.progress_dialog.show(true);
                     location.href = oilsBasePath +
                         "/url_verify/review_attempt?attempt_id=" +
                         module.attempt.id();

diff --git a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
index 7adeb65..e97a918 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js
@@ -284,17 +284,17 @@ if (!dojo._hasResource["openils.widget.FlattenerGrid"]) {
                 return {"labels": labels, "columns": columns};
             },
 
-            "_getAutoFieldFields": function(fmclass) {
+            "_getAutoFieldFields": function(fmclass, path) {
                 var field_list = dojo.clone(
                     fieldmapper.IDL.fmclasses[fmclass].fields)
                 .filter(
                     function(f) { return !f.virtual && f.datatype != "link"; }
                 );
                 
-                /* Sort fields unless the class is named in grid property
+                /* Sort fields unless the path is named in grid property
                  * 'autoFieldFieldsUnsorted' (array). */
                 if (!dojo.isArray(this.autoFieldFieldsUnsorted) ||
-                        !this.autoFieldFieldsUnsorted[fmclass]) {
+                        this.autoFieldFieldsUnsorted.indexOf(path) == -1) {
                     field_list = field_list.sort(
                         function(a, b) { return a.label > b.label ? 1 : -1; }
                     );
@@ -355,7 +355,9 @@ if (!dojo._hasResource["openils.widget.FlattenerGrid"]) {
                             return;
                         } else {
                             dojo.forEach(
-                                self._getAutoFieldFields(beginning.fmClass),
+                                self._getAutoFieldFields(
+                                    beginning.fmClass, path
+                                ),
                                 function(field) {
                                     var would_be_path =
                                         path + "." + field.name;