Bugzilla – Attachment 44988 Details for
Bug 14889
Move the framework related code to Koha::BiblioFramework[s]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 14889: Fix error msg on duplicate
PASSED-QA-Bug-14889-Fix-error-msg-on-duplicate.patch (text/plain), 2.29 KB, created by
Katrin Fischer
on 2015-11-19 10:43:20 UTC
(
hide
)
Description:
[PASSED QA] Bug 14889: Fix error msg on duplicate
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-11-19 10:43:20 UTC
Size:
2.29 KB
patch
obsolete
>From 78571f1485214c01bf38363bf812167713ac7473 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 26 Oct 2015 08:55:43 +0000 >Subject: [PATCH] [PASSED QA] Bug 14889: Fix error msg on duplicate > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > admin/biblio_framework.pl | 7 ++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 1 + > 2 files changed, 5 insertions(+), 3 deletions(-) > >diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl >index 79f3eba..79a0db1 100755 >--- a/admin/biblio_framework.pl >+++ b/admin/biblio_framework.pl >@@ -54,9 +54,10 @@ if ( $op eq 'add_form' ) { > } elsif ( $op eq 'add_validate' ) { > my $frameworkcode = $input->param('frameworkcode'); > my $frameworktext = $input->param('frameworktext'); >+ my $is_a_modif = $input->param('is_a_modif'); > >- my $framework = Koha::BiblioFrameworks->find($frameworkcode); >- if ($framework) { >+ if ($is_a_modif) { >+ my $framework = Koha::BiblioFrameworks->find($frameworkcode); > $framework->frameworktext($frameworktext); > eval { $framework->store; }; > if ($@) { >@@ -65,7 +66,7 @@ if ( $op eq 'add_form' ) { > push @messages, { type => 'message', code => 'success_on_update' }; > } > } else { >- $framework = Koha::BiblioFramework->new( >+ my $framework = Koha::BiblioFramework->new( > { frameworkcode => $frameworkcode, > frameworktext => $frameworktext, > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index bed0052..52ce915 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -151,6 +151,7 @@ > <li> > <span class="label">Framework code: </span> > <input type="hidden" id="frameworkcode" name="frameworkcode" value="[% framework.frameworkcode %]" />[% framework.frameworkcode %] >+ <input type="hidden" name="is_a_modif" value="1" /> > </li> > [% ELSE %] > <li> >-- >1.9.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 14889
:
42846
|
42847
|
43775
|
43776
|
43944
|
43974
|
43975
|
44493
|
44494
|
44495
|
44496
|
44497
|
44985
|
44986
|
44987
| 44988 |
44989
|
47857