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

(-)a/admin/biblio_framework.pl (-1 / +9 lines)
Lines 45-63 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
45
45
46
my $dbh = C4::Context->dbh;
46
my $dbh = C4::Context->dbh;
47
if ( $op eq 'add_form' ) {
47
if ( $op eq 'add_form' ) {
48
    my $frameworks = Koha::BiblioFrameworks->search( {}, { order_by => ['frameworktext'], } );
48
    my $framework;
49
    my $framework;
49
    if ($frameworkcode) {
50
    if ($frameworkcode) {
50
        $framework = Koha::BiblioFrameworks->find($frameworkcode);
51
        $framework = Koha::BiblioFrameworks->find($frameworkcode);
51
    }
52
    }
52
    $template->param( framework => $framework );
53
    $template->param(
54
        framework  => $framework,
55
        frameworks => $frameworks,
56
    );
53
} elsif ( $op eq 'cud-add_validate' ) {
57
} elsif ( $op eq 'cud-add_validate' ) {
54
    my $frameworkcode = $input->param('frameworkcode');
58
    my $frameworkcode = $input->param('frameworkcode');
55
    my $frameworktext = $input->param('frameworktext');
59
    my $frameworktext = $input->param('frameworktext');
56
    my $is_a_modif    = $input->param('is_a_modif');
60
    my $is_a_modif    = $input->param('is_a_modif');
61
    my $parent_frameworkcode = $input->param('parent_frameworkcode');
62
    $parent_frameworkcode = undef if $input->param('parent_frameworkcode') eq '__undef__';
57
63
58
    if ($is_a_modif) {
64
    if ($is_a_modif) {
59
        my $framework = Koha::BiblioFrameworks->find($frameworkcode);
65
        my $framework = Koha::BiblioFrameworks->find($frameworkcode);
60
        $framework->frameworktext($frameworktext);
66
        $framework->frameworktext($frameworktext);
67
        $framework->parent_frameworkcode($parent_frameworkcode);
61
        eval { $framework->store; };
68
        eval { $framework->store; };
62
        if ($@) {
69
        if ($@) {
63
            push @messages, { type => 'error', code => 'error_on_update' };
70
            push @messages, { type => 'error', code => 'error_on_update' };
Lines 69-74 if ( $op eq 'add_form' ) { Link Here
69
            {
76
            {
70
                frameworkcode => $frameworkcode,
77
                frameworkcode => $frameworkcode,
71
                frameworktext => $frameworktext,
78
                frameworktext => $frameworktext,
79
                parent_frameworkcode => $parent_frameworkcode,
72
            }
80
            }
73
        );
81
        );
74
        eval { $framework->store; };
82
        eval { $framework->store; };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt (-1 / +16 lines)
Lines 129-134 Link Here
129
                            <input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" required="required" class="required focus" />
129
                            <input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" required="required" class="required focus" />
130
                            <span class="required">Required</span>
130
                            <span class="required">Required</span>
131
                        </li>
131
                        </li>
132
                    [% END %]
133
                        <li>
134
                    [% IF frameworks %]
135
                            <label for="parent_frameworkcode">Parent framework: </label>
136
                            <select name="parent_frameworkcode" id="parent_frameworkcode" />
137
                                <option value="__undef__">None</option>
138
                            [% FOREACH loo IN frameworks %]
139
                            [% NEXT IF framework && loo.frameworkcode == framework.frameworkcode %]
140
                                [% IF framework.parent_frameworkcode == loo.frameworkcode %]
141
                                    <option value="[% loo.frameworkcode | html %]" selected>[% loo.frameworktext | html %]</option>
142
                                [% ELSE %]
143
                                    <option value="[% loo.frameworkcode | html %]">[% loo.frameworktext | html %]</option>
144
                                [% END %]
145
                            [% END %]
146
                            </select>
147
                        </li>
132
                    [% END %]
148
                    [% END %]
133
                    <li>
149
                    <li>
134
                        <label for="description" class="required">Description: </label>
150
                        <label for="description" class="required">Description: </label>
135
- 

Return to bug 35471