Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
index 525871d..152bb50 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
@@ -675,7 +675,7 @@ sub _build_volume_list {
 
         my $copies = $e->search_asset_copy([
             { call_number => $volume->id , deleted => 'f' },
-            { flesh => 1, flesh_fields => { acp => ['parts'] } }
+            { flesh => 1, flesh_fields => { acp => ['stat_cat_entries','parts'] } }
         ]);
 
         $copies = [ sort { $a->barcode cmp $b->barcode } @$copies  ];

diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
index ae896a7..55bad58 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
+++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js
@@ -52,7 +52,7 @@ function scSetPerms() {
     PERMS[ASSET].update_stat_cat_entry =  OILS_WORK_PERMS.UPDATE_COPY_STAT_CAT_ENTRY;
     PERMS[ASSET].delete_stat_cat_entry =  OILS_WORK_PERMS.DELETE_COPY_STAT_CAT_ENTRY;
 
-    // set up the fitler select
+    // set up the filter select
     var fselector = $('sc_org_filter');
     var org_list = PERMS[currentlyVisible].update_stat_cat;
     buildMergedOrgSel(fselector, org_list, 0, 'shortname');
@@ -296,10 +296,13 @@ function scBuildNew() {
     var org_list = PERMS[type].create_stat_cat;
     if(org_list.length == 0) { /* no create perms */
         $('sc_new').disabled = true;
-        typeSel.disabled = true;
         libSel.disabled = true;
         return;
     }
+    else {
+        $('sc_new').disabled = false;
+        libSel.disabled = false;
+    }
     buildMergedOrgSel(libSel, org_list, 0, 'shortname');
 }
 

diff --git a/README b/README
index 4c943cd..882c738 100644 (file)
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ before you can successfully configure, compile, and install Evergreen.
 +
 [source, bash]
 ------------------------------------------------------------------------------
-deb http://www.backports.org/debian squeeze-backports main contrib
+deb http://backports.debian.org/debian-backports squeeze-backports main contrib
 ------------------------------------------------------------------------------
 +
   * On Ubuntu Lucid, add the following line to `/etc/apt/sources.list`: