Bugzilla – Attachment 160699 Details for
Bug 35329
Move patron searches to a modal
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35329: Move patron search to modal - neworderempty
Bug-35329-Move-patron-search-to-modal---neworderem.patch (text/plain), 2.65 KB, created by
Jonathan Druart
on 2024-01-09 14:54:11 UTC
(
hide
)
Description:
Bug 35329: Move patron search to modal - neworderempty
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2024-01-09 14:54:11 UTC
Size:
2.65 KB
patch
obsolete
>From d509bd63f7d03a334579fbefcf7dbd47404a7d1d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 4 Jan 2024 16:44:39 +0100 >Subject: [PATCH] Bug 35329: Move patron search to modal - neworderempty > >Test plan: >Create a new acquisition order and add users. > >FIXME: >Note that rules for .modal-dialog .dialog.message need to be adjusted. >--- > .../prog/en/modules/acqui/neworderempty.tt | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index b256882583c..ef08eb00ac7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -7,6 +7,7 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% PROCESS 'i18n.inc' %] >+[% PROCESS 'patron-search.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% FILTER collapse %] > [% IF ( ordernumber ) %] >@@ -198,14 +199,6 @@ > $("#budget_id").change(); > }); > >- function UserSearchPopup(f) { >- window.open( >- "/cgi-bin/koha/members/search.pl?columns=cardnumber,name,category,branch,action&selection_type=add", >- 'UserSearchPopup', >- 'width=1024, height=768, scrollbars=yes, toolbar=no,' >- ); >- } >- > function add_user(borrowernumber, borrowername) { > var ids = $("#users_ids").val(); > if(ids.length > 0) { >@@ -232,6 +225,10 @@ > $("#users_ids").val(ids.join(':')); > } > </script> >+ >+ [% SET columns = ['cardnumber','name','category','branch','action'] %] >+ [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %] >+ > [% Asset.css("css/addbiblio.css") | $raw %] > </head> > >@@ -338,7 +335,7 @@ > </ul> > <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" /> > <input type="hidden" id="op" name="op" value="mod_users" /> >- <input type="button" id="add_user" class="btn btn-default" onclick="UserSearchPopup();" value="Add user" /> >+ <a href="#patron_search_modal" id="add_user" class="btn btn-default" data-toggle="modal"><i class="fa fa-plus"></i> Add user</a> > </div> > </li> > </ol> >@@ -780,6 +777,8 @@ > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >+[% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %] >+ > [% MACRO jsinclude BLOCK %] > [% END %] > >-- >2.34.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 35329
:
160698
|
160699
|
160700
|
160701
|
160702
|
160703
|
160704
|
160705
|
160706
|
160728
|
160729
|
160733
|
160734
|
160735
|
160736
|
160737
|
160738
|
160739
|
160740
|
160741
|
160742
|
160743
|
160759
|
160760
|
160761
|
160762
|
160763
|
160768
|
160769
|
160770
|
160771
|
160773
|
160774
|
160940
|
160941
|
160943
|
160944
|
160945
|
160946
|
160947
|
160948
|
160949
|
160950
|
160951
|
160952
|
160953
|
160954
|
160955
|
160956
|
160957
|
160958
|
160959
|
161165
|
161166
|
161183
|
161184
|
161185
|
161186
|
161187
|
161188
|
161189
|
161190
|
161191
|
161192
|
161193
|
161194
|
161195
|
161196
|
161197
|
161198
|
161199
|
161259
|
161260
|
161274
|
161275
|
161276
|
161277
|
161278
|
161279
|
161280
|
161281
|
161282
|
161283
|
161284
|
161285
|
161286
|
161287
|
161288
|
161289
|
161290
|
161291
|
161292
|
161293
|
161294
|
161295
|
161398
|
161399
|
161400
|
161401
|
161402
|
161403
|
161404
|
161405
|
161406
|
161407
|
161408
|
161409
|
161410
|
161411
|
161412
|
161413
|
161414
|
161415
|
161416
|
161417
|
162436
|
162437
|
162438
|
162439
|
162440
|
162441
|
162442
|
162443
|
162444
|
162445
|
162446
|
162447
|
162448
|
162449
|
162450
|
162451
|
162452
|
162453
|
162454
|
162455
|
162456
|
162457
|
162670
|
162671
|
162713
|
162714