Attachment #56454 for bug #15801

View | Details | Raw Unified | Return to bug 15801
Collapse All | Expand All




	require Exporter;
	@ISA    = qw(Exporter);
	@EXPORT = qw(
        &GetPrinters &GetPrinter
        &GetItemTypes &getitemtypeinfo
                &GetItemTypesCategorized &GetItemTypesByCategory
        &getallthemes
        &getFacets
        &getnbpages
		&getnbpages
		&get_infos_of
		&get_notforloan_label_of
		&getitemtypeimagedir

    return @$tmp;
}

=head2 getframeworkinfo

  $frameworkinfo = &getframeworkinfo($frameworkcode);

Returns information about an frameworkcode.

=cut

sub getframeworkinfo {
    my ($frameworkcode) = @_;
    my $dbh             = C4::Context->dbh;
    my $sth             =
      $dbh->prepare("select * from biblio_framework where frameworkcode=?");
    $sth->execute($frameworkcode);
    my $res = $sth->fetchrow_hashref;
    return $res;
}

=head2 getitemtypeinfo

  $itemtype = &getitemtypeinfo($itemtype, [$interface]);




my $frameworkcode         = $input->param('frameworkcode')         || ''; # set to select framework
my $existingframeworkcode = $input->param('existingframeworkcode') || '';
my $searchfield           = $input->param('searchfield') || 0;
# set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
my $frameworkinfo = getframeworkinfo($frameworkcode);
$searchfield=~ s/\,//g;

my $offset    = $input->param('offset') || 0;

	}
}

my $framework = $frameworks->search({ frameworkcode => $frameworkcode })->next;
$template->param(
    frameworks    => $frameworks,
    framework     => $framework,
    frameworktext => $frameworkinfo->{frameworktext},
    script_name   => $script_name,
    ( $op || 'else' ) => 1,
);

	}
	$template->param(existingframeworkloop => \@existingframeworkloop,
					frameworkcode => $frameworkcode,
# 					FRtext => $frameworkinfo->{frameworktext},
					);
################## DEFAULT ##################################
} else { # DEFAULT




# along with Koha; if not, see <http://www.gnu.org/licenses>.
# 

use Modern::Perl;
#use warnings; FIXME - Bug 2505
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Context;
use Koha::BiblioFrameworks;

my $query = new CGI;
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(

);

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
$template->param( fast_cataloging => 1 ) if (defined $fa);

# Checking if the transfer page needs to be displayed
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );

Lines 47-52 use Koha::Patron; Link Here

(-)a/circ/circulation.pl (-1 / +2 lines)
47	use Koha::Patron::Debarments qw(GetDebarments);	47	use Koha::Patron::Debarments qw(GetDebarments);
48	use Koha::DateUtils;	48	use Koha::DateUtils;
49	use Koha::Database;	49	use Koha::Database;
		50	use Koha::BiblioFrameworks;
50	use Koha::Patron::Messages;	51	use Koha::Patron::Messages;
51	use Koha::Patron::Images;	52	use Koha::Patron::Images;
52	use Koha::SearchEngine;	53	use Koha::SearchEngine;
Lines 581-587 my $patron_messages = Koha::Patron::Messages->search( Link Here
581	);	582	);
582		583
583	my $fast_cataloging = 0;	584	my $fast_cataloging = 0;
584	if (defined getframeworkinfo('FA')) {	585	if ( Koha::BiblioFrameworks->find('FA') ) {
585	$fast_cataloging = 1	586	$fast_cataloging = 1
586	}	587	}
587		588




&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
[% IF ( add_form ) %]
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framework.frameworktext %] ([% framework.frameworkcode %])</a>
&rsaquo; [% action %] [% searchfield %]
[% ELSIF ( else ) %]
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
[% ELSIF ( delete_confirm ) %]
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framwork.frameworktext %] ([% framework.frameworkcode %])</a>
&rsaquo; Confirm deletion of tag '[% searchfield %]'
[% ELSIF ( delete_confirmed ) %]
&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framework.frameworktext %] ([% framework.frameworkcode %])</a>
&rsaquo; Data deleted
[% END %]
</div>


[% IF ( else ) %]
<div id="toolbar" class="btn-toolbar">
    <a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> New tag</a>
</div>[% END %]

<h1>MARC Framework for [% IF framework %][% framework.frameworktext %] ([% framework.frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>

[% IF ( add_form ) %]

    <form action="[% script_name %]" name="Aform" method="post" class="validated">
	
      <fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag <input type="hidden" name="modif" value="1" />[% searchfield %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action %][% END %]</legend>  <input type="hidden" name="op" value="add_validate" />
    <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />

        <ol>
            <li>

</ol></fieldset> 
    <fieldset class="action">
        <input type="submit" value="Save changes" />
        <a class="cancel" href="[% script_name %]?frameworkcode=[% framework.frameworkcode %]">Cancel</a>
    </fieldset>
    </form>
[% END %]

        <form action="[% script_name %]" method="post">
            <input type="hidden" name="op" value="delete_confirmed" />
            <input type="hidden" name="searchfield" value="[% searchfield %]" />
            <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
            <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
        </form>
        <form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
            <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
        </form>
    </div>

[% IF ( delete_confirmed ) %]

    <div class="dialog message"><h3>Tag deleted</h3>
    <form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
        <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
    </form></div>
[% END %]


    <form action="[% script_name %]" method="post">
        <input type="hidden" name="op" value="framework_create_confirm" />
        <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
        Create framework for [% frameworkcode %] ([% framework.frameworktext %]) using
        <select name="existingframeworkcode">
            <option value="">Default</option>
        [% FOREACH existingframeworkloo IN existingframeworkloop %]

<label for="frameworkcode"><strong>In framework:</strong> </label>
        <select id="frameworkcode" name="frameworkcode">
            <option value="">Default</option>
            [% FOREACH f IN frameworks %]
            [% IF f.frameworkcode == framework.frameworkcode %]
                <option value="[% f.frameworkcode %]" selected="selected">[% f.frameworktext %]</option>
                [% ELSE %]
                <option value="[% f.frameworkcode %]">[% f.frameworktext %]</option>
                [% END %]
            [% END %]
        </select>
- 

Return to bug 15801

Lines 37-49 BEGIN { Link Here

(-)a/C4/Koha.pm (-24 / +5 lines)
37	require Exporter;	37	require Exporter;
38	@ISA = qw(Exporter);	38	@ISA = qw(Exporter);
39	@EXPORT = qw(	39	@EXPORT = qw(
40	&GetPrinters &GetPrinter	40	&GetPrinters &GetPrinter
41	&GetItemTypes &getitemtypeinfo	41	&GetItemTypes &getitemtypeinfo
42	&GetItemTypesCategorized &GetItemTypesByCategory	42	&GetItemTypesCategorized &GetItemTypesByCategory
43	&getframeworkinfo	43	&getallthemes
44	&getallthemes	44	&getFacets
45	&getFacets	45	&getnbpages
46	&getnbpages
47	&get_infos_of	46	&get_infos_of
48	&get_notforloan_label_of	47	&get_notforloan_label_of
49	&getitemtypeimagedir	48	&getitemtypeimagedir
Lines 226-249 sub GetItemTypesByCategory { Link Here
226	return @$tmp;	225	return @$tmp;
227	}	226	}
228		227
229	=head2 getframeworkinfo
230
231	$frameworkinfo = &getframeworkinfo($frameworkcode);
232
233	Returns information about an frameworkcode.
234
235	=cut
236
237	sub getframeworkinfo {
238	my ($frameworkcode) = @_;
239	my $dbh = C4::Context->dbh;
240	my $sth =
241	$dbh->prepare("select * from biblio_framework where frameworkcode=?");
242	$sth->execute($frameworkcode);
243	my $res = $sth->fetchrow_hashref;
244	return $res;
245	}
246
247	=head2 getitemtypeinfo	228	=head2 getitemtypeinfo
248		229
249	$itemtype = &getitemtypeinfo($itemtype, [$interface]);	230	$itemtype = &getitemtypeinfo($itemtype, [$interface]);

Lines 16-28 Link Here

(-)a/circ/circulation-home.pl (-5 / +3 lines)
16	# along with Koha; if not, see <http://www.gnu.org/licenses>.	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
17	#	17	#
18		18
19	use strict;	19	use Modern::Perl;
20	#use warnings; FIXME - Bug 2505
21	use CGI qw ( -utf8 );	20	use CGI qw ( -utf8 );
22	use C4::Auth;	21	use C4::Auth;
23	use C4::Output;	22	use C4::Output;
24	use C4::Context;	23	use C4::Context;
25	use C4::Koha;	24	use Koha::BiblioFrameworks;
26		25
27	my $query = new CGI;	26	my $query = new CGI;
28	my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(	27	my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(
Lines 36-43 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( Link Here
36	);	35	);
37		36
38	# Checking if there is a Fast Cataloging Framework	37	# Checking if there is a Fast Cataloging Framework
39	my $fa = getframeworkinfo('FA');	38	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
40	$template->param( fast_cataloging => 1 ) if (defined $fa);
41		39
42	# Checking if the transfer page needs to be displayed	40	# Checking if the transfer page needs to be displayed
43	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );	41	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );

Lines 38-52 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt (-18 / +17 lines)
38	&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>	38	&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
39	&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>	39	&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
40	[% IF ( add_form ) %]	40	[% IF ( add_form ) %]
41	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>	41	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framework.frameworktext %] ([% framework.frameworkcode %])</a>
42	&rsaquo; [% action %] [% searchfield %]	42	&rsaquo; [% action %] [% searchfield %]
43	[% ELSIF ( else ) %]	43	[% ELSIF ( else ) %]
44	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>	44	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% IF framework %][% framework.frameworktext %] ([% framework.frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
45	[% ELSIF ( delete_confirm ) %]	45	[% ELSIF ( delete_confirm ) %]
46	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>	46	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framwork.frameworktext %] ([% framework.frameworkcode %])</a>
47	&rsaquo; Confirm deletion of tag '[% searchfield %]'	47	&rsaquo; Confirm deletion of tag '[% searchfield %]'
48	[% ELSIF ( delete_confirmed ) %]	48	[% ELSIF ( delete_confirmed ) %]
49	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>	49	&rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode %]">[% framework.frameworktext %] ([% framework.frameworkcode %])</a>
50	&rsaquo; Data deleted	50	&rsaquo; Data deleted
51	[% END %]	51	[% END %]
52	</div>	52	</div>
Lines 58-74 $(document).ready(function() { Link Here
58		58
59	[% IF ( else ) %]	59	[% IF ( else ) %]
60	<div id="toolbar" class="btn-toolbar">	60	<div id="toolbar" class="btn-toolbar">
61	<a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% frameworkcode %]"><i class="fa fa-plus"></i> New tag</a>	61	<a class="btn btn-small" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&frameworkcode=[% framework.frameworkcode %]"><i class="fa fa-plus"></i> New tag</a>
62	</div>[% END %]	62	</div>[% END %]
63		63
64	<h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>	64	<h1>MARC Framework for [% IF framework %][% framework.frameworktext %] ([% framework.frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>
65		65
66	[% IF ( add_form ) %]	66	[% IF ( add_form ) %]
67		67
68	<form action="[% script_name %]" name="Aform" method="post" class="validated">	68	<form action="[% script_name %]" name="Aform" method="post" class="validated">
69		69
70	<fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag <input type="hidden" name="modif" value="1" />[% searchfield %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action %][% END %]</legend> <input type="hidden" name="op" value="add_validate" />	70	<fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag <input type="hidden" name="modif" value="1" />[% searchfield %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action %][% END %]</legend> <input type="hidden" name="op" value="add_validate" />
71	<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />	71	<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
72		72
73	<ol>	73	<ol>
74	<li>	74	<li>
Lines 112-118 $(document).ready(function() { Link Here
112	</ol></fieldset>	112	</ol></fieldset>
113	<fieldset class="action">	113	<fieldset class="action">
114	<input type="submit" value="Save changes" />	114	<input type="submit" value="Save changes" />
115	<a class="cancel" href="[% script_name %]?frameworkcode=[% frameworkcode %]">Cancel</a>	115	<a class="cancel" href="[% script_name %]?frameworkcode=[% framework.frameworkcode %]">Cancel</a>
116	</fieldset>	116	</fieldset>
117	</form>	117	</form>
118	[% END %]	118	[% END %]
Lines 126-135 $(document).ready(function() { Link Here
126	<form action="[% script_name %]" method="post">	126	<form action="[% script_name %]" method="post">
127	<input type="hidden" name="op" value="delete_confirmed" />	127	<input type="hidden" name="op" value="delete_confirmed" />
128	<input type="hidden" name="searchfield" value="[% searchfield %]" />	128	<input type="hidden" name="searchfield" value="[% searchfield %]" />
129	<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />	129	<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
130	<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>	130	<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete this tag</button>
131	</form>	131	</form>
132	<form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />	132	<form action="[% script_name %]" method="get"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
133	<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>	133	<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
134	</form>	134	</form>
135	</div>	135	</div>
Lines 138-144 $(document).ready(function() { Link Here
138	[% IF ( delete_confirmed ) %]	138	[% IF ( delete_confirmed ) %]
139		139
140	<div class="dialog message"><h3>Tag deleted</h3>	140	<div class="dialog message"><h3>Tag deleted</h3>
141	<form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />	141	<form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
142	<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>	142	<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> OK</button>
143	</form></div>	143	</form></div>
144	[% END %]	144	[% END %]
Lines 146-153 $(document).ready(function() { Link Here
146		146
147	<form action="[% script_name %]" method="post">	147	<form action="[% script_name %]" method="post">
148	<input type="hidden" name="op" value="framework_create_confirm" />	148	<input type="hidden" name="op" value="framework_create_confirm" />
149	<input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />	149	<input type="hidden" name="frameworkcode" value="[% framework.frameworkcode %]" />
150	Create framework for [% frameworkcode %] ([% frameworktext %]) using	150	Create framework for [% frameworkcode %] ([% framework.frameworktext %]) using
151	<select name="existingframeworkcode">	151	<select name="existingframeworkcode">
152	<option value="">Default</option>	152	<option value="">Default</option>
153	[% FOREACH existingframeworkloo IN existingframeworkloop %]	153	[% FOREACH existingframeworkloo IN existingframeworkloop %]
Lines 168-178 $(document).ready(function() { Link Here
168	<label for="frameworkcode"><strong>In framework:</strong> </label>	168	<label for="frameworkcode"><strong>In framework:</strong> </label>
169	<select id="frameworkcode" name="frameworkcode">	169	<select id="frameworkcode" name="frameworkcode">
170	<option value="">Default</option>	170	<option value="">Default</option>
171	[% FOREACH framework IN frameworks %]	171	[% FOREACH f IN frameworks %]
172	[% IF framework.frameworkcode == frameworkcode %]	172	[% IF f.frameworkcode == framework.frameworkcode %]
173	<option value="[% framework.frameworkcode %]" selected="selected">[% framework.frameworktext %]</option>	173	<option value="[% f.frameworkcode %]" selected="selected">[% f.frameworktext %]</option>
174	[% ELSE %]	174	[% ELSE %]
175	<option value="[% framework.frameworkcode %]">[% framework.frameworktext %]</option>	175	<option value="[% f.frameworkcode %]">[% f.frameworktext %]</option>
176	[% END %]	176	[% END %]
177	[% END %]	177	[% END %]
178	</select>	178	</select>
179	-

Lines 35-42 my $input = new CGI; Link Here

(-)a/admin/marctagstructure.pl (-5 / +2 lines)
35	my $frameworkcode = $input->param('frameworkcode') \|\| ''; # set to select framework	35	my $frameworkcode = $input->param('frameworkcode') \|\| ''; # set to select framework
36	my $existingframeworkcode = $input->param('existingframeworkcode') \|\| '';	36	my $existingframeworkcode = $input->param('existingframeworkcode') \|\| '';
37	my $searchfield = $input->param('searchfield') \|\| 0;	37	my $searchfield = $input->param('searchfield') \|\| 0;
38	# set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
39	my $frameworkinfo = getframeworkinfo($frameworkcode);
40	$searchfield=~ s/\,//g;	38	$searchfield=~ s/\,//g;
41		39
42	my $offset = $input->param('offset') \|\| 0;	40	my $offset = $input->param('offset') \|\| 0;
Lines 76-85 unless ($frameworkexist) { Link Here
76	}	74	}
77	}	75	}
78		76
		77	my $framework = $frameworks->search({ frameworkcode => $frameworkcode })->next;
79	$template->param(	78	$template->param(
80	frameworks => $frameworks,	79	frameworks => $frameworks,
81	frameworkcode => $frameworkcode,	80	framework => $framework,
82	frameworktext => $frameworkinfo->{frameworktext},
83	script_name => $script_name,	81	script_name => $script_name,
84	( $op \|\| 'else' ) => 1,	82	( $op \|\| 'else' ) => 1,
85	);	83	);
Lines 209-215 if ($op eq 'add_form') { Link Here
209	}	207	}
210	$template->param(existingframeworkloop => \@existingframeworkloop,	208	$template->param(existingframeworkloop => \@existingframeworkloop,
211	frameworkcode => $frameworkcode,	209	frameworkcode => $frameworkcode,
212	# FRtext => $frameworkinfo->{frameworktext},
213	);	210	);
214	################## DEFAULT ##################################	211	################## DEFAULT ##################################
215	} else { # DEFAULT	212	} else { # DEFAULT