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

Return to bug 29113