Bugzilla – Attachment 95164 Details for
Bug 23590
Add the ability to change the manager of a suggestion and notify the new manager
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23590: Cleaning - Remove op_* vars
Bug-23590-Cleaning---Remove-op-vars.patch (text/plain), 4.07 KB, created by
Jonathan Druart
on 2019-11-07 15:12:52 UTC
(
hide
)
Description:
Bug 23590: Cleaning - Remove op_* vars
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2019-11-07 15:12:52 UTC
Size:
4.07 KB
patch
obsolete
>From f061a4943ab3253e845efd7a265c4bbc027f2525 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 6 Nov 2019 19:17:32 +0100 >Subject: [PATCH] Bug 23590: Cleaning - Remove op_* vars > >--- > .../prog/en/modules/suggestion/suggestion.tt | 22 ++++++++++------------ > suggestion/suggestion.pl | 1 - > 2 files changed, 10 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 9da2357822..d349072918 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -7,7 +7,7 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › >- [% IF ( op_save ) %] >+ [% IF op == 'save' %] > [% IF ( suggestionid ) %] > Suggestions › Edit suggestion #[% suggestionid | html %] > [% ELSE %] >@@ -20,9 +20,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-[% IF ( op_else ) %] >-[% END %] >-[% IF ( op_else ) %] >+[% IF op == 'else' %] > <style> > h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; } > .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("[% interface | html %]/[% theme | html %]/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; } >@@ -35,7 +33,7 @@ > [% INCLUDE 'cat-search.inc' %] > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- [% IF ( op_save ) %] >+ [% IF op == 'save' %] > [% IF ( suggestionid ) %] > <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> › Edit suggestion #[% suggestionid | html %] > [% ELSE %] >@@ -226,7 +224,7 @@ > </div> > [% ELSE %] > >-[% IF ( op_save ) %] >+[% IF op == 'save' %] > <div class="main container-fluid"> > <div class="row"> > <div class="col-md-8 col-md-offset-2"> >@@ -238,7 +236,7 @@ > > [% END %] > >-[% IF ( op_save ) %] >+[% IF op == 'save' %] > [% FOR m IN messages %] > <div class="dialog [% m.type | html %]"> > [% SWITCH m.code %] >@@ -461,7 +459,7 @@ > </form> > [% END %] > >-[% IF ( op_else ) %] >+[% IF op == 'else' %] > <div id="toolbar" class="btn-toolbar"> > <a class="btn btn-default" id="newsuggestion" href="suggestion.pl?op=add"><i class="fa fa-plus"></i> New purchase suggestion</a> > </div> >@@ -671,7 +669,7 @@ > [% END %] > [% END %] > >-[% UNLESS ( op_save ) %] >+[% UNLESS op == 'save' %] > [% UNLESS ( op == 'show' ) %] > > </main> >@@ -834,7 +832,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- [% IF ( op == 'show' || op_else ) %] >+ [% IF ( op == 'show' || op == 'else' ) %] > <script type="text/javascript"> > $(document).ready(function(){ > $(".deletesuggestion").on("click",function(){ >@@ -843,7 +841,7 @@ > }); > </script> > [% END %] >- [% IF ( op_else ) %] >+ [% IF op == 'else' %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] > <script type="text/javascript"> >@@ -962,7 +960,7 @@ > }); > </script> > [% END %] >- [% IF ( op_save ) %] >+ [% IF op == 'save' %] > <script type="text/javascript"> > > function editManagerPopup() { >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 06f23e07fe..50dfb4c324 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -335,7 +335,6 @@ $template->param( > > $template->param( > %$suggestion_ref, >- "op_$op" => 1, > "op" =>$op, > ); > >-- >2.11.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 23590
:
95162
|
95163
|
95164
|
95165
|
95166
|
95167
|
95168
|
95169
|
95317
|
95318
|
95319
|
95320
|
95321
|
95322
|
95323
|
95324
|
95398
|
95399
|
95407
|
95408
|
95420
|
95421
|
95422
|
95423
|
95424
|
95425
|
95426
|
95427
|
95428
|
95429
|
95430
|
95431
|
95487
|
95488
|
95489
|
95490
|
95491
|
95492
|
95493
|
95494
|
95495
|
95496
|
95497
|
95498
|
98119
|
98120
|
98121
|
98122
|
98123
|
98124
|
98126
|
98127
|
98128
|
98129
|
98130
|
98131
|
98240
|
98267
|
98268
|
98279
|
100788
|
100789
|
100790
|
100791
|
100792
|
100793
|
100794
|
100795
|
100796
|
100797
|
100798
|
100799
|
100800
|
100801
|
100802
|
100803
|
100804
|
100846
|
100847
|
100848
|
100849
|
100850
|
100851
|
100852
|
100853
|
101539
|
101548
|
101588
|
101589
|
101590
|
101591
|
101592
|
101593
|
101594
|
101595
|
101596
|
101597
|
101598
|
101599
|
101600
|
101601
|
101602
|
101603
|
101604
|
101605
|
101606
|
101695