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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-11 / +1 lines)
Lines 171-190 Link Here
171
171
172
    <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
172
    <form id="add_additional_content" method="post" action="/cgi-bin/koha/tools/additional-contents.pl" class="validate">
173
        <input type="hidden" name="op" value="add_validate" />
173
        <input type="hidden" name="op" value="add_validate" />
174
        <input type="hidden" name="id" value="[% additional_content.idnew | html %]" />
175
        <input type="hidden" name="category" value="[% category | html %]" />
174
        <input type="hidden" name="category" value="[% category | html %]" />
175
        <input type="hidden" name="code" value="[% code | html %]" />
176
        <fieldset class="rows">
176
        <fieldset class="rows">
177
            <ol>
177
            <ol>
178
                <li>
179
                    [% IF additional_content %]
180
                        <span class="label">Code:</span> [% additional_content.code | html %]
181
                        <input type="hidden" id="code" name="code" value="[% additional_content.code | html %]" />
182
                    [% ELSE %]
183
                        <label for="code" class="required">Code:</label>
184
                        <input type="text" id="code" name="code" size="20" maxlength="20" value="" required="required"/>
185
                        <span class="required">Required</span>
186
                    [% END %]
187
                </li>
188
                <li>
178
                <li>
189
                    <label for="location">Display location:</label>
179
                    <label for="location">Display location:</label>
190
                    <select id="location" name="location">
180
                    <select id="location" name="location">
(-)a/tools/additional-contents.pl (-4 / +12 lines)
Lines 106-112 elsif ( $op eq 'add_validate' ) { Link Here
106
    my $number = $cgi->param('number');
106
    my $number = $cgi->param('number');
107
107
108
    my $success = 1;
108
    my $success = 1;
109
    for my $lang ( @lang ) {
109
    for my $lang ( sort {$a ne 'default'} @lang ) { # Process 'default' first
110
        my $title = shift @title;
110
        my $title = shift @title;
111
        my $content = shift @content;
111
        my $content = shift @content;
112
        my $additional_content = Koha::AdditionalContents->find(
112
        my $additional_content = Koha::AdditionalContents->find(
Lines 160-166 elsif ( $op eq 'add_validate' ) { Link Here
160
            my $additional_content = Koha::AdditionalContent->new(
160
            my $additional_content = Koha::AdditionalContent->new(
161
                {
161
                {
162
                    category       => $category,
162
                    category       => $category,
163
                    code           => $code,
163
                    code           => $code || 'tmp_code',
164
                    location       => $location,
164
                    location       => $location,
165
                    branchcode     => $branchcode,
165
                    branchcode     => $branchcode,
166
                    title          => $title,
166
                    title          => $title,
Lines 172-178 elsif ( $op eq 'add_validate' ) { Link Here
172
                    borrowernumber => $borrowernumber,
172
                    borrowernumber => $borrowernumber,
173
                }
173
                }
174
            )->store;
174
            )->store;
175
            eval { $additional_content->store; };
175
            eval {
176
                $additional_content->store;
177
                unless ($code) {
178
                    $additional_content->discard_changes;
179
                    $code = $category eq 'news'
180
                      ? 'News_' . $additional_content->idnew
181
                      : $location . '_' . $additional_content->idnew;
182
                    $additional_content->code($code)->store;
183
                }
184
            };
176
            if ($@) {
185
            if ($@) {
177
                $success = 0;
186
                $success = 0;
178
                push @messages, { type => 'error', code => 'error_on_insert' };
187
                push @messages, { type => 'error', code => 'error_on_insert' };
179
- 

Return to bug 29113