Bugzilla – Attachment 81248 Details for
Bug 13952
Import and export of authority types
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13952: (follow-up) Fixing leftover merge conflict stuff
Bug-13952-follow-up-Fixing-leftover-merge-conflict.patch (text/plain), 1.46 KB, created by
Aleisha Amohia
on 2018-10-25 23:25:21 UTC
(
hide
)
Description:
Bug 13952: (follow-up) Fixing leftover merge conflict stuff
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2018-10-25 23:25:21 UTC
Size:
1.46 KB
patch
obsolete
>From 2acfc9b835b4a53c43e77f19de737ff213b64fa8 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Thu, 25 Oct 2018 23:10:51 +0000 >Subject: [PATCH] Bug 13952: (follow-up) Fixing leftover merge conflict stuff > >There was some leftover stuff from a merge conflict messing with the JS, >so I have fixed this up. The window now closes after export, as >expected. > >Have noticed however that export breaks with authtypecodes that have a >slash (/) in them. Will set to Assigned to fix this. > >Also need to add a fail message for when authtypecodes do not match on >import. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 5 ----- > 1 file changed, 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index ae3f73c..30b214e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -233,15 +233,10 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >-<<<<<<< HEAD > [% Asset.js("js/admin-menu.js") | $raw %] > <script> >-======= >- [% Asset.js("js/admin-menu.js") %] >- <script type="text/javascript"> > var importing = false; > >->>>>>>> Bug 13952: Import and export authority types > $(document).ready(function() { > $("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, { > "aoColumnDefs": [ >-- >2.1.4
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 13952
:
44770
|
47326
|
47360
|
47364
|
50046
|
53065
|
53066
|
54840
|
54899
|
54900
|
57873
|
59831
|
64421
|
67914
|
67915
|
68299
|
68300
|
68301
|
68502
|
68512
|
68513
|
68514
|
68515
|
68556
|
69940
|
69941
|
69942
|
69943
|
69944
|
76665
|
76666
|
76667
|
76668
|
80794
|
80795
|
80796
|
80797
|
81248
|
82853
|
82854
|
82855
|
82856
|
82895
|
83024
|
83025
|
83026
|
83027
|
83028
|
85073
|
86549
|
86550
|
86551
|
86552
|
86553
|
86554
|
86555
|
103610
|
103611
|
103612
|
103613
|
103614
|
103615
|
103616
|
114170
|
114171
|
114172
|
114173
|
114174
|
114175
|
114176
|
114177
|
115379
|
115381
|
115382
|
115383
|
115384
|
115385
|
115386
|
115387
|
115388
|
125383
|
125384
|
125385
|
125386
|
125387
|
125388
|
125389
|
125390
|
128316
|
128317
|
128318
|
128319
|
128320
|
128321
|
128322
|
128323
|
128324
|
128325
|
128326
|
128327
|
128328
|
128329
|
128330
|
128331
|
130587
|
130917
|
130918
|
130919
|
130920
|
130921
|
130922
|
130923
|
130924
|
130925