[Koha-patches] [PATCH] bugs 3989, 3990, 3996, 3997 - sys prefs resolved

Nicole Engard nengard at gmail.com
Thu Feb 4 09:47:22 CET 2010


bug 3989 - RoutingSerials & RenewSerialAddsSuggestion
moved to serials tab and descriptions updated

bug 3990 - add RoutingListAddReserves pref to serials tab

bug 3996 - add intranetbookbag pref to staff client tab

but 3997 - add ReservesControlBranch to circulation tab
---
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc  |    1 +
 .../en/modules/admin/preferences/acquisitions.pref |    7 -------
 .../en/modules/admin/preferences/cataloguing.pref  |    6 ------
 .../en/modules/admin/preferences/circulation.pref  |    7 +++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 .../prog/en/modules/admin/preferences/serials.pref |   19 +++++++++++++++++++
 .../en/modules/admin/preferences/staff-client.pref |    6 ++++++
 7 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index f029ee5..6926d69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -13,6 +13,7 @@
 <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
 <!-- TMPL_IF NAME="searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
+<!-- TMPL_IF NAME="serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
 <!-- TMPL_IF NAME="staff-client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
 <!-- TMPL_IF NAME="web-services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 4daf86d..a1ea02d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -1,13 +1,6 @@
 # Broken, omitted: acquisitions, emailPurchaseSuggestions
 # Unsure how to format the OrderPdfTemplate field as a browse option
 Acquisitions:
-    Serials:
-    -
-        - pref: RenewSerialAddsSuggestion
-          choices:
-              yes: Add
-              no: "Don't add"
-        - a suggestion for a biblio when its attached serial is renewed.
     Policy:
     -
         - Create an item when    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 4bb248d..8d2a021 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -65,12 +65,6 @@ Cataloging:
               class: multi
             - tags (separated by commas) to the correct author tags when importing a record using Z39.50.
         -
-            - pref: RoutingSerials
-              choices:
-                  yes: Add
-                  no: "Don't add"
-            - extra information to items automatically added to serials.
-        -
             - Barcodes are
             - pref: autoBarcode
               choices:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 409fcea..e2b2b72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -211,6 +211,13 @@ Circulation:
                   no: "Don't allow"
             - "patrons to place holds that don't enter the waiting list until a certain future date. (AllowHoldDateInFuture must also be enabled)."
         -
+            - Check the
+            - pref: ReservesControlBranch
+              choices:
+                  ItemHomeLibrary: "item's home library"
+                  PatronLibrary: "patron's home library"
+            - to see if the patron can place a hold on the item.                  
+        -
             - Satisfy holds from the libraries
             - pref: StaticHoldsQueueWeight
               class: multi
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index aabfce8..8194f81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -33,7 +33,7 @@ OPAC:
               choices:
                   yes: Show
                   no: "Don't show"
-            - "a warning that the OPAC is under maintenance, instead of the OPAC itself. Note: this shows the same warning as when the database needs upgraded, but unconditionally."
+            - "a warning that the OPAC is under maintenance, instead of the OPAC itself. Note: this shows the same warning as when the database needs to be upgraded, but unconditionally."
         -
             - By default, show bib records
             - pref: BiblioDefaultView
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
new file mode 100644
index 0000000..a74b7cf
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
@@ -0,0 +1,19 @@
+Serials:
+    -
+        - pref: RenewSerialAddsSuggestion
+          choices:
+              yes: Add
+              no: "Don't add"
+        - a suggestion for a biblio when its attached serial is renewed.
+    -
+        - pref: RoutingSerials
+          choices:
+              yes: Add
+              no: "Don't add"
+        - received serials to the routing list.
+    -
+        - pref: RoutingListAddReserves
+          choices:
+              yes: Place
+              no: "Don't place"
+        - received serials on hold if they are on a routing list.
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
index 5bbce22..cfae7ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
@@ -77,3 +77,9 @@ Staff Client:
                   yes: Show
                   no: "Don't show"
             - the names of patrons that have items checked out or on hold on detail pages or the "Place Hold" screen.
+        -
+            - pref: intranetbookbag
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the cart option in the staff client.
-- 
1.5.6.5




More information about the Koha-patches mailing list