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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (+25 lines)
Lines 315-320 Link Here
315
                                        [% END %]
315
                                        [% END %]
316
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=itemcallnumber&amp;direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | uri %][% END %]">Call number</a>
316
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=itemcallnumber&amp;direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | uri %][% END %]">Call number</a>
317
                                        </th>
317
                                        </th>
318
                                        [% IF sortfield == 'dateaccessioned' %]
319
                                            <th class="sorting_[% direction | html %]">
320
                                        [% ELSE %]
321
                                            <th class="sorting">
322
                                        [% END %]
323
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=dateaccessioned&amp;direction=[% IF sortfield != 'dateaccessioned' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date acquired</a>
324
325
                                        </th>
318
                                    </tr>
326
                                    </tr>
319
                                </thead>
327
                                </thead>
320
                                [% FOREACH itemsloo IN itemsloop %]
328
                                [% FOREACH itemsloo IN itemsloop %]
Lines 383-388 Link Here
383
                                                [% END # /FOREACH item %]
391
                                                [% END # /FOREACH item %]
384
                                            </ul>
392
                                            </ul>
385
                                        </td>
393
                                        </td>
394
                                        <td>
395
                                            <ul>
396
                                                [% FOREACH item IN itemsloo.ITEM_RESULTS %]
397
                                                    <li>
398
                                                        [% IF (item.dateaccessioned ) %]
399
                                                            [% item.dateaccessioned | $KohaDates %]
400
                                                        [% END %]
401
                                                    </li>
402
                                                [% END %]
403
                                            </ul>
404
                                        </td>
386
                                    </tr>
405
                                    </tr>
387
                                [% END #/FOREACH itemsloo %]
406
                                [% END #/FOREACH itemsloo %]
388
                            </table> <!-- /#searchresults -->
407
                            </table> <!-- /#searchresults -->
Lines 452-457 Link Here
452
                                    [% ELSE %]
471
                                    [% ELSE %]
453
                                        <option value="dateadded">Date added</option>
472
                                        <option value="dateadded">Date added</option>
454
                                    [% END %]
473
                                    [% END %]
474
                                    [% IF shelf.sortfield == "dateaccessioned" %]
475
                                        <option value="dateaccessioned" selected="selected">Date acquired</option>
476
                                    [% ELSE %]
477
                                        <option value="dateaccessioned">Date acquired</option>
478
                                    [% END %]
455
                                </select>
479
                                </select>
456
                            </li>
480
                            </li>
457
                            <li>
481
                            <li>
Lines 534-539 Link Here
534
                                                <option value="copyrightdate">Copyrightdate</option>
558
                                                <option value="copyrightdate">Copyrightdate</option>
535
                                                <option value="itemcallnumber">Call number</option>
559
                                                <option value="itemcallnumber">Call number</option>
536
                                                <option value="dateadded">Date added</option>
560
                                                <option value="dateadded">Date added</option>
561
                                                <option value="dateaccessioned">Date acquired</option>
537
                                            </select>
562
                                            </select>
538
                                        </th>
563
                                        </th>
539
                                        <th></th>
564
                                        <th></th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt (-1 / +1 lines)
Lines 20-26 Link Here
20
                "dt_owner":
20
                "dt_owner":
21
                    "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% d.owner | html %]'>[% d.firstname | html | $To %] [% d.surname | html | $To %]</a>",
21
                    "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% d.owner | html %]'>[% d.firstname | html | $To %] [% d.surname | html | $To %]</a>",
22
                "dt_sortby":
22
                "dt_sortby":
23
                    [% IF d.sortby == "author" %]"<span>Author</span>"[% ELSIF d.sortby == "copyrightdate" %]"<span>Year</span>"[% ELSIF d.sortby == "itemcallnumber" %]"<span>Call number</span>"[% ELSIF d.sortby == "dateadded" %]"<span>Date added</span>"[% ELSE %]"<span>Title</span>"[% END %],
23
                [% IF d.sortby == "author" %]"<span>Author</span>"[% ELSIF d.sortby == "copyrightdate" %]"<span>Year</span>"[% ELSIF d.sortby == "itemcallnumber" %]"<span>Call number</span>"[% ELSIF d.sortby == "dateadded" %]"<span>Date added</span>"[% ELSIF d.sortby == "dateaccessioned" %]"<span>Date acquired</span>"[% ELSE %]"<span>Title</span>"[% END %],
24
                "dt_created_on":
24
                "dt_created_on":
25
                    "[% d.created_on | $KohaDates %]",
25
                    "[% d.created_on | $KohaDates %]",
26
                "dt_modification_time":
26
                "dt_modification_time":
(-)a/virtualshelves/shelves.pl (-3 / +7 lines)
Lines 120-126 if ( $op eq 'add_form' ) { Link Here
120
    if ( $shelf ) {
120
    if ( $shelf ) {
121
        $op = $referer;
121
        $op = $referer;
122
        my $sortfield = $query->param('sortfield');
122
        my $sortfield = $query->param('sortfield');
123
        $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
123
        $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded dateaccessioned );
124
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
124
        if ( $shelf->can_be_managed( $loggedinuser ) ) {
125
            $shelf->shelfname( scalar $query->param('shelfname') );
125
            $shelf->shelfname( scalar $query->param('shelfname') );
126
            $shelf->sortfield( $sortfield );
126
            $shelf->sortfield( $sortfield );
Lines 278-286 if ( $op eq 'view' ) { Link Here
278
    if ( $shelf ) {
278
    if ( $shelf ) {
279
        if ( $shelf->can_be_viewed( $loggedinuser ) ) {
279
        if ( $shelf->can_be_viewed( $loggedinuser ) ) {
280
            my $sortfield = $query->param('sortfield') || $shelf->sortfield || 'title';    # Passed in sorting overrides default sorting
280
            my $sortfield = $query->param('sortfield') || $shelf->sortfield || 'title';    # Passed in sorting overrides default sorting
281
            $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
281
            $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded dateaccessioned );
282
            my $direction = $query->param('direction') || 'asc';
282
            my $direction = $query->param('direction') || 'asc';
283
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
283
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
284
285
            # If sorting by dateaccessioned set direction to descending by default
286
            $direction = 'desc' if $sortfield eq 'dateaccessioned';
287
284
            my $rows;
288
            my $rows;
285
            if ( $query->param('print') ) {
289
            if ( $query->param('print') ) {
286
                $page = "";
290
                $page = "";
Lines 326-331 if ( $op eq 'view' ) { Link Here
326
                $this_item->{part_name}         = $biblio->part_name;
330
                $this_item->{part_name}         = $biblio->part_name;
327
                $this_item->{author}            = $biblio->author;
331
                $this_item->{author}            = $biblio->author;
328
                $this_item->{dateadded}         = $content->dateadded;
332
                $this_item->{dateadded}         = $content->dateadded;
333
                $this_item->{dateaccessioned}   = $biblio->items->get_column("dateaccessioned");
329
                $this_item->{imageurl}          = $itemtype ? C4::Koha::getitemtypeimagelocation( 'intranet', $itemtype->imageurl ) : q{};
334
                $this_item->{imageurl}          = $itemtype ? C4::Koha::getitemtypeimagelocation( 'intranet', $itemtype->imageurl ) : q{};
330
                $this_item->{description}       = $itemtype ? $itemtype->description : q{}; #FIXME Should this be translated_description ?
335
                $this_item->{description}       = $itemtype ? $itemtype->description : q{}; #FIXME Should this be translated_description ?
331
                $this_item->{notforloan}        = $itemtype->notforloan if $itemtype;
336
                $this_item->{notforloan}        = $itemtype->notforloan if $itemtype;
332
- 

Return to bug 36188