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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (+2 lines)
Lines 296-301 Link Here
296
            [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
296
            [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
297
            [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
297
            [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
298
            [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
298
            [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
299
            [% IF shelf.sortfield == "dateadded" %]<option value="dateadded" selected="selected">Date added</option>[% ELSE %]<option value="dateadded">Date added</option>[% END %]
299
            </select></li>
300
            </select></li>
300
            <li><label for="category">Category: </label>
301
            <li><label for="category">Category: </label>
301
                <select id="category" name="category" onchange="AdjustRemark()">
302
                <select id="category" name="category" onchange="AdjustRemark()">
Lines 368-373 Link Here
368
                                <option value="author">Author</option>
369
                                <option value="author">Author</option>
369
                                <option value="copyrightdate">Copyrightdate</option>
370
                                <option value="copyrightdate">Copyrightdate</option>
370
                                <option value="itemcallnumber">Call number</option>
371
                                <option value="itemcallnumber">Call number</option>
372
                                <option value="dateadded">Date added</option>
371
                            </select>
373
                            </select>
372
                        </th>
374
                        </th>
373
                        <th></th>
375
                        <th></th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt (-1 / +1 lines)
Lines 18-24 Link Here
18
                "dt_owner":
18
                "dt_owner":
19
                    "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.owner %]'>[% data.firstname %] [% data.surname %]</a>",
19
                    "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.owner %]'>[% data.firstname %] [% data.surname %]</a>",
20
                "dt_sortby":
20
                "dt_sortby":
21
                    [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSE %]"Title"[% END %],
21
                    [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSIF data.sortby == "dateadded" %]"Date added"[% ELSE %]"Title"[% END %],
22
                "dt_created_on":
22
                "dt_created_on":
23
                    "[% data.created_on | $KohaDates %]",
23
                    "[% data.created_on | $KohaDates %]",
24
                "dt_modification_time":
24
                "dt_modification_time":
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (+11 lines)
Lines 229-234 Link Here
229
                                        [% ELSE %]
229
                                        [% ELSE %]
230
                                            <option value="copyrightdate">Copyright date</option>
230
                                            <option value="copyrightdate">Copyright date</option>
231
                                        [% END %]
231
                                        [% END %]
232
233
                                        [% IF sortfield == "dateadded" %]
234
                                            <option value="dateadded" selected="selected">Date added</option>
235
                                        [% ELSE %]
236
                                            <option value="dateadded">Date added</option>
237
                                        [% END %]
232
                                    </select>
238
                                    </select>
233
239
234
                                    <select name="direction" class="resort" onchange="$('#sorting-form').submit()">
240
                                    <select name="direction" class="resort" onchange="$('#sorting-form').submit()">
Lines 584-589 Link Here
584
                                            [% ELSE %]
590
                                            [% ELSE %]
585
                                                <option value="itemcallnumber">Call number</option>
591
                                                <option value="itemcallnumber">Call number</option>
586
                                            [% END %]
592
                                            [% END %]
593
                                            [% IF shelf.sortfield == "dateadded" %]
594
                                                <option value="dateadded" selected="selected">Date added</option>
595
                                            [% ELSE %]
596
                                                <option value="dateadded">Date added</option>
597
                                            [% END %]
587
                                        </select>
598
                                        </select>
588
                                    </li>
599
                                    </li>
589
                                    [% IF Koha.Preference('OpacAllowPublicListCreation') OR category == PUBLIC %]
600
                                    [% IF Koha.Preference('OpacAllowPublicListCreation') OR category == PUBLIC %]
(-)a/opac/opac-shelves.pl (-2 / +2 lines)
Lines 114-120 if ( $op eq 'add_form' ) { Link Here
114
    if ( $shelf ) {
114
    if ( $shelf ) {
115
        $op = $referer;
115
        $op = $referer;
116
        my $sortfield = $query->param('sortfield');
116
        my $sortfield = $query->param('sortfield');
117
        $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber );
117
        $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
118
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
118
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
119
            $shelf->shelfname( scalar $query->param('shelfname') );
119
            $shelf->shelfname( scalar $query->param('shelfname') );
120
            $shelf->sortfield( $sortfield );
120
            $shelf->sortfield( $sortfield );
Lines 235-241 if ( $op eq 'view' ) { Link Here
235
        if ( $shelf->can_be_viewed( $loggedinuser ) ) {
235
        if ( $shelf->can_be_viewed( $loggedinuser ) ) {
236
            $category = $shelf->category;
236
            $category = $shelf->category;
237
            my $sortfield = $query->param('sortfield') || $shelf->sortfield;    # Passed in sorting overrides default sorting
237
            my $sortfield = $query->param('sortfield') || $shelf->sortfield;    # Passed in sorting overrides default sorting
238
            $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber );
238
            $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
239
            my $direction = $query->param('direction') || 'asc';
239
            my $direction = $query->param('direction') || 'asc';
240
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
240
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
241
            my ( $page, $rows );
241
            my ( $page, $rows );
(-)a/virtualshelves/shelves.pl (-2 / +1 lines)
Lines 101-107 if ( $op eq 'add_form' ) { Link Here
101
    if ( $shelf ) {
101
    if ( $shelf ) {
102
        $op = $referer;
102
        $op = $referer;
103
        my $sortfield = $query->param('sortfield');
103
        my $sortfield = $query->param('sortfield');
104
        $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber );
104
        $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
105
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
105
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
106
            $shelf->shelfname( scalar $query->param('shelfname') );
106
            $shelf->shelfname( scalar $query->param('shelfname') );
107
            $shelf->sortfield( $sortfield );
107
            $shelf->sortfield( $sortfield );
108
- 

Return to bug 19039