Bugzilla – Attachment 40602 Details for
Bug 14440
get_template_and_user can not have an empty template_name
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
(qa fix) sysprefs order and TT plugin access
qa-fix-sysprefs-order-and-TT-plugin-access.patch (text/plain), 3.24 KB, created by
Indranil Das Gupta
on 2015-06-24 20:15:50 UTC
(
hide
)
Description:
(qa fix) sysprefs order and TT plugin access
Filename:
MIME Type:
Creator:
Indranil Das Gupta
Created:
2015-06-24 20:15:50 UTC
Size:
3.24 KB
patch
obsolete
>From 0c21d62c50ee7fc6fc45ea8eb8ad1af962adb2a6 Mon Sep 17 00:00:00 2001 >From: Indranil Das Gupta <indradg@gmail.com> >Date: Wed, 24 Jun 2015 01:19:57 +0530 >Subject: [PATCH] (qa fix) sysprefs order and TT plugin access > >Addresses the QA comments from Jonathan Druart in comment #6. > >http://bugs.koha-community.org/show_bug.cgi?id=11674 > >http://bugs.koha-community.org/show_bug.cgi?id=14440 >--- > installer/data/mysql/sysprefs.sql | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index a6d2898..92c7847 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -199,9 +199,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('LocalHoldsPriorityPatronControl', 'PickupLibrary', 'HomeLibrary|PickupLibrary', 'decides if the feature operates using the library set as the patron''s home library, or the library set as the pickup library for the given hold.', 'Choice'), > ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'), > ('MARCAuthorityControlField008','|| aca||aabn | a|a d',NULL,'Define the contents of MARC21 authority control field 008 position 06-39','Textarea'), >+('MarcFieldDocURL', NULL, NULL, 'URL used for MARC field documentation. Following substitutions are available: {MARC} = marc flavour, eg. "MARC21" or "UNIMARC". {FIELD} = field number, eg. "000" or "048". {LANG} = user language, eg. "en" or "fi-FI"', 'free'), > ('MarcFieldsToOrder','',NULL,'Set the mapping values for a new order line created from a MARC record in a staged file. In a YAML format.','textarea'), > ('MARCOrgCode','OSt','','Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html','free'), >-('MarcFieldDocURL', NULL, NULL, 'URL used for MARC field documentation. Following substitutions are available: {MARC} = marc flavour, eg. "MARC21" or "UNIMARC". {FIELD} = field number, eg. "000" or "048". {LANG} = user language, eg. "en" or "fi-FI"', 'free'), > ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'), > ('MaxItemsForBatch','1000',NULL,'Max number of items record to process in a batch (modification or deletion)','Integer'), > ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 47bcc49..8aea9e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -140,7 +140,7 @@ function PopupZ3950() { > } > > function PopupMARCFieldDoc(field) { >- [% IF (marcfielddocurl) %] >+ [% IF Koha.Preference( 'marcfielddocurl' ) %] > var docurl = "[% marcfielddocurl.replace('"','"') %]"; > docurl = docurl.replace("{MARC}", "[% marcflavour %]"); > docurl = docurl.replace("{FIELD}", ""+field); >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14440
:
40533
|
40544
|
40546
|
40559
|
40595
|
40600
|
40601
|
40602
|
40607
|
40608
|
40609
|
40620
|
40621
|
40622
|
40648