Bugzilla – Attachment 38539 Details for
Bug 11559
Professional cataloger's interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11559 followup - a number of small UI bugfixes
Bug-11559-followup---a-number-of-small-UI-bugfixes.patch (text/plain), 6.90 KB, created by
Jonathan Druart
on 2015-04-27 08:05:14 UTC
(
hide
)
Description:
Bug 11559 followup - a number of small UI bugfixes
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-04-27 08:05:14 UTC
Size:
6.90 KB
patch
obsolete
>From b3ced77957fdaaa0e0529214f454eae0156d55fc Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Wed, 4 Mar 2015 04:10:44 -0700 >Subject: [PATCH] Bug 11559 followup - a number of small UI bugfixes > >--- > cataloguing/addbiblio.pl | 2 +- > cataloguing/editor.pl | 4 +- > .../prog/en/includes/cateditor-ui.inc | 68 +++------------------- > 3 files changed, 12 insertions(+), 62 deletions(-) > >diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl >index 4694587..c4471de 100755 >--- a/cataloguing/addbiblio.pl >+++ b/cataloguing/addbiblio.pl >@@ -751,7 +751,7 @@ if ($frameworkcode eq 'FA'){ > # Only use the advanced editor for non-fast-cataloging. > # breedingid is not handled because those would only come off a Z39.50 > # search initiated by the basic editor. >- print $input->redirect( '/cgi-bin/koha/cataloguing/editor.pl' . ( $biblionumber ? ( '#catalog:' . $biblionumber ) : '' ) ); >+ print $input->redirect( '/cgi-bin/koha/cataloguing/editor.pl' . ( $biblionumber ? ( '#catalog/' . $biblionumber ) : '' ) ); > } > > >diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl >index 4f4f380..6d0fd0d 100755 >--- a/cataloguing/editor.pl >+++ b/cataloguing/editor.pl >@@ -60,8 +60,8 @@ $template->{VARS}->{DefaultLanguageField008} = pack( 'A3', C4::Context->preferen > my $dbh = C4::Context->dbh; > $template->{VARS}->{z3950_servers} = $dbh->selectall_arrayref( q{ > SELECT * FROM z3950servers >- WHERE recordtype != 'authority' >- ORDER BY name >+ WHERE recordtype != 'authority' AND servertype = 'zed' >+ ORDER BY servername > }, { Slice => {} } ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index fcc8136..89a11ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -28,16 +28,9 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > recordtype: 'biblio', > checked: false, > }, >- [%- FOREACH batch = editable_batches -%] >- 'batch:[% batch.import_batch_id %]': { >- name: _("Batch: ") + '[% batch.file_name %]', >- recordtype: 'biblio', >- checked: false, >- }, >- [%- END -%] > [%- FOREACH server = z3950_servers -%] > [% server.id %]: { >- name: '[% server.name %]', >+ name: '[% server.servername %]', > recordtype: '[% server.recordtype %]', > checked: [% server.checked ? 'true' : 'false' %], > }, >@@ -268,14 +261,6 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > }, > }; > >- var editable_batches = { >- [%- FOREACH batch = editable_batches -%] >- [% batch.import_batch_id %]: { >- 'name': '[% batch.file_name %]', >- }, >- [%- END -%] >- }; >- > function setSource(parts) { > state.backend = parts[0]; > state.recordID = parts[1]; >@@ -693,7 +678,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > var name = prompt(_("Please enter the name for the new macro:")); > if (!name) return; > >- if ( !Preferences.user.macros[name] ) storeMacro( name, { contents: "" } ); >+ if ( !Preferences.user.macros[name] ) storeMacro( name, { format: "rancor", contents: "" } ); > showSavedMacros(); > loadMacro( name ); > } ); >@@ -866,55 +851,17 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > > reader.onload = function() { > var record = new MARC.Record(); >- $("#search-overlay").show(); >- Search.includedServers = [1]; >- showResultsBox(); > > if ( /\.mrc$/.test( file.name ) ) { >- /*var data = { >- errors: {}, >- num_fetched: {}, >- hits: [], >- sort_direction: 'asc', >- sort_key: 'title', >- }; >- data.hits = []; >- $.each( reader.result.split('\035'), function( i, blob ) { >- if ( !blob ) return; >- >- var record = new MARC.Record(); >- record.loadISO2709( blob ); >- >- var hit = { >- server: 1, >- record: record, >- index: i, >- metadata: {}, >- }; >- >- var _addField = function(field, tag, subf) { >- var f = record.field(tag); >- if (!f) return; >- var s = f.subfield(subf); >- if (s!==false) hit.metadata[field] = s; >- } >- >- _addField('local_number', '001', '@'); >- _addField('isbn', '020', 'a'); >- _addField('author', '100', 'a'); >- _addField('title', '245', 'a'); >- >- data.hits.push(hit); >- } ); >- showSearchResults(editor, data); >- $("#search-overlay").hide();*/ >- record.loadISO2709( blob ); >+ record.loadISO2709( reader.result ); > } else if ( /\.xml$/.test( file.name ) ) { > record.loadMARCXML( reader.result ); > } else { > humanMsg.displayAlert( _("Unknown record type, cannot import"), { className: 'humanError' } ); > return; > } >+ >+ editor.displayRecord( record ); > }; > > reader.readAsText( file ); >@@ -933,7 +880,10 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > $('#run-macro').click( function() { > var result = Macros.Run( editor, $('#macro-format').val(), macroEditor.getValue() ); > >- if ( !result.errors.length ) return false; >+ if ( !result.errors.length ) { >+ $('#macro-ui').modal('hide'); >+ return false; >+ } > > var errors = []; > $.each( result.errors, function() { >-- >2.1.0
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 11559
:
26069
|
26070
|
26071
|
26104
|
26653
|
26654
|
27140
|
27141
|
27142
|
27757
|
27758
|
27759
|
27760
|
27761
|
27900
|
27901
|
27902
|
27993
|
27995
|
34458
|
34459
|
34460
|
34461
|
34462
|
34463
|
36243
|
36244
|
36245
|
36246
|
36247
|
36248
|
36455
|
38533
|
38534
|
38535
|
38536
|
38537
|
38538
|
38539
|
40153
|
40154
|
40155
|
40543
|
40555
|
40556
|
40557
|
40558
|
40811
|
40812
|
40813
|
40814
|
40815
|
41425
|
41453
|
41476
|
42373
|
43261
|
43547
|
43614
|
43615
|
43616
|
43617
|
43618
|
43619
|
43620
|
43621
|
43622
|
43623
|
43703
|
43704
|
43705
|
43706
|
43707
|
43708
|
43709
|
43710
|
43711
|
43712
|
43713
|
43772
|
43790
|
43883
|
43969
|
44016
|
44018
|
44022
|
44023
|
44024
|
44025
|
44026
|
44027
|
44028
|
44029
|
44030
|
44031
|
44032
|
44033
|
44034
|
44035
|
44036