Just send the codes and descriptions only to client.
Adding a few comments to the reduce construction.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
The "MARC overlay rules" page doesn't display or work correctly
if a patron category code contains a "-".
This happens because of the JavaScript function in
"marc-overlay-rules.tt" line 469. This causes an error
"Uncaught SyntaxError: missing : after property id".
Test plan:
1. Go to Administration > Patron categories.
2. Make sure you don't have a patron category code that contains
a "-".
3. Go to Administration > Record overlay rules.
4. The table should display correctly, and you can add, edit
and delete rules.
5. Return to Patron categories.
6. Add a new patron category with a "-" in the patron category code.
7. Return to Record overlay rules page:
=> The page doesn't display and load correctly (see the attached
image) - the normal DataTables header and footer aren't
displayed, and you can't add, edit or delete overlay rules.
=> If you turn on web developer tools, an error is displayed in the
console: "Uncaught SyntaxError: missing : after property id".
8. Apply the patch.
9. Repeat the step 7, the Record overlay rules page should now
display correctly and you should be able to add, edit and
delete rules.
10. Sign off.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch updates several administration templates so that they
use the new WRAPPER for displaying breadcrumbs.
To test, apply the patch and test each page and its variations.
Breadcrumbs should look correct, and each link should be correct.
Administration ->
- Record overlay rules
- Search filters (must have SavedSearchFilters enabled)
- System preferences
-> OverDriveAuthName -> OverDrive library authnames table
- MARC bibliographic framework -> MARC structure (list, new, edit,
delete confirm).
- Record matching rules (list, new, edit, delete confirm)
- OAI sets configuration (list, new, edit)
-> Define mappings
- Patron attribute types (list, new, edit, delete confirm)
- Patron restrictions (list, new, edit, delete confirm)
Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch adds a page-section div to some administration pages in order
to provide a consistent structure visual contrast. The following pages
are modified:
Additional fields
Funds
Authority types
Authority types -> MARC tag structure
Authority types -> MARC tag structure -> Subfields
MARC bibliographic framework
MARC bibliographic framework -> MARC tag structure
MARC bibliographic framework -> MARC tag structure -> Subfields
MARC Bibliographic framework test
Classification configuration
Currencies and exchange rates
EDI accounts
Library EANs
Item search fields
Koha to MARC mapping
Record overlay rules
Record matching rules
OAI sets configuration
SMTP servers
Z39.50/SRU servers
To test, view each page to confirm that the page-section div visibly
delineates the main content area.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch add the context 'noun' to the 'Filter' string in
marc-overlay-rules.tt. This will separate that instance of 'Filter' from
the other ones, where it is meant as a verb.
To test:
1. Apply patch
2. Visit Administration > MARC overlay rules, make sure the page works
(no errors) and that there is a column called 'Filter'
3. Update the po files
gulp po:update --lang xx-XX
for example, gulp po:update --lang fr-CA
4. Check the xx-XX-messages.po file (e.g.
misc/translator/po/fr-CA-messages.po), there should be an entry for
'Filter', with a line msgctxt that gives the 'noun' context
5. Update the file with a random word for the 'Filter' translation
for example, I translated 'Filter' by 'Filter as a noun', just to see
the difference
\#: koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt:83
msgctxt "noun"
msgid "Filter"
msgstr "Filter as a noun"
6. Install a new language
6.1. Run the following commands in the terminal, replacing xx-XX with
the language code (e.g. fr-CA)
cd misc/translator
./translate install xx-XX
6.2. In the Koha staff interface, go to Administration > Global system
preferences
6.3. Search for language
6.4. Check the box next to the new language
6.5. Save
7. View the MARC overlay rules page in the new language, the 'Filter'
column heading should be whatever you put in step 5
Optional test
8. In the staff interface in English, view one or more of these pages,
the 'Filter' should be unchanged
- Acquisitions > Late orders (Filter button)
- Aquisitions > Search for vendor > Receive shipments (Filter heading on
the left and Filter button)
- Acquisitions > Search for vendor > Click vendor's name > Uncertain
prices (Filter button)
- Administration > Budgets > Click budget's name > Planning > Plan by
... (any option) (Filter heading on the left)
- Reports > Use saved (Filter heading on the left)
- Reports > Acquisitions statistics wizard (Filter column heading)
- Reports > Patrons statistics wizard (Filter column heading)
- Reports > Catalog statistics wizard (Filter column heading)
- Reports > Circulation statistics wizard (Filter column heading)
- Reports > Holds statistics wizard (Filter column heading)
- Reports > Average loan time (Filter column heading)
- Tools > News (Filter heading on the left)
9. View these same pages in the other language, the Filter should NOT be
changed to whatever you put in step 5
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
What this patch does:
- change the navigation bar style
- change the breadcrumbs style
- change the "last borrower" link style
- move the search bar inside the navigation bar
- move the help link to the same row as the breadcrumbs
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch corrects the terminology for staff interface in the record overlay rules administration page.
To test:
1) Apply patch
2) Enable the MARCOverlayRules system preference
3) Go to Administration > Record overlay rules
4) Open the 'Filter' drop-down menu
=> The second option should read 'Staff interface MARC editor'
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To be nicer with translators.
Update the PO files for whichever languages will show how this is
useful.
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Rebased-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Strings must not contain html tags, we should use KohaSpan instead.
Test plan:
Apply the patch, update translation for a given language, edit XX-YY-staff-prog.po
Notice that the string is now
"The %s preference is not set, don't forget to enable it for rules to take effect."
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
It appears this patchset doesn't fully support bulkmarcimport (see bug
25539 for details).
At this time, to get this bug moving I think we should comment out the
ability to define rules that affect bulkmarcimport and then we can fix
and re-enable that feature at a later date.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch fixes all the translation issues I could spot in the
marc-overlay-rules template.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch acknowledges the fact that 'merging' has a different meaning
in Koha than the behavior this great patchset introduces. The more
idiomatic way of describing the behavior is to talk about 'overlay rules'.
This patch also:
- Fixes kohastructure.sql missing table encoding a collation
- Fixes the atomic update completely missing a table
- Moves the syspref entry to 'Importing', probably a rebase issue
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: (QA follow-up) Fix syntax error in atomicupdate
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix imports in tests
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix imports in marc-overlay-rules.pl
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: Fix syspref's values
It didn't switch off when set to "don't use"
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
JD amended patch: Fix license statement
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-10-26 16:46:02 +02:00
Renamed from koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-merge-rules.tt (Browse further)
