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

(-)a/admin/columns_settings.yml (+21 lines)
Lines 950-955 modules: Link Here
950
              cannot_be_toggled: 1
950
              cannot_be_toggled: 1
951
              cannot_be_modified: 1
951
              cannot_be_modified: 1
952
952
953
  virtualshelves:
954
    lists:
955
      searchresults:
956
        columns:
957
            -
958
              columnname: checkbox
959
              cannot_be_toggled: 1
960
              cannot_be_modified: 1
961
            -
962
              columnname: item_type
963
            -
964
              columnname: title
965
              cannot_be_toggled: 1
966
              cannot_be_modified: 1
967
            -
968
              columnname: author
969
            -
970
              columnname: date_added
971
            -
972
              columnname: call_number
973
953
  members:
974
  members:
954
    fines:
975
    fines:
955
      account-fines:
976
      account-fines:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (+16 lines)
Lines 354-359 Link Here
354
                                    </div> <!-- /.panel-collapse -->
354
                                    </div> <!-- /.panel-collapse -->
355
                                </div>
355
                                </div>
356
356
357
                                <div class="panel panel-default">
358
                                    <div class="panel-heading" role="tab" id="virtualshelvesHeading">
359
                                        <h2 class="panel-title">
360
                                            <a id="virtualshelvesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#virtualshelves" aria-expanded="false" aria-controls="collapseOne">
361
                                                Lists
362
                                            </a>
363
                                        </h2>
364
                                    </div> <!-- /.panel-heading -->
365
                                    <div id="virtualshelves" class="panel-collapse collapse" role="tabpanel" aria-labelledby="virtualshelvesHeading">
366
                                        <div class="panel-body">
367
                                            <h3>Lists tables</h3>
368
                                            [% PROCESS pagelist module=modules.virtualshelves modulename="virtualshelves" %]
369
                                        </div> <!-- /.panel-body -->
370
                                    </div> <!-- /.panel-collapse -->
371
                                </div>
372
357
                                <div class="panel panel-default">
373
                                <div class="panel panel-default">
358
                                    <div class="panel-heading" role="tab" id="membersHeading">
374
                                    <div class="panel-heading" role="tab" id="membersHeading">
359
                                        <h2 class="panel-title">
375
                                        <h2 class="panel-title">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-75 / +84 lines)
Lines 3-8 Link Here
3
[% USE Asset %]
3
[% USE Asset %]
4
[% USE Koha %]
4
[% USE Koha %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% USE TablesSettings %]
6
[% USE AuthorisedValues %]
7
[% USE AuthorisedValues %]
7
[% USE Branches %]
8
[% USE Branches %]
8
[% PROCESS 'i18n.inc' %]
9
[% PROCESS 'i18n.inc' %]
Lines 282-390 Link Here
282
                                <thead>
283
                                <thead>
283
                                    <tr>
284
                                    <tr>
284
                                        [% IF ( itemsloop ) %]
285
                                        [% IF ( itemsloop ) %]
285
                                            <th class="checkall">&nbsp;</th>
286
                                            <th class="checkall" data-colname="checkbox">&nbsp;</th>
286
                                        [% END %]
287
                                        [% END %]
287
                                        [% UNLESS ( item_level_itypes ) %]
288
                                        [% UNLESS ( item_level_itypes ) %]
288
                                            <th>Item type</th>
289
                                            <th data-colname="item_type">Item type</th>
289
                                        [% END %]
290
                                        [% END %]
290
                                        [% IF sortfield == 'title' %]
291
                                        [% IF sortfield == 'title' %]
291
                                            <th class="sorting_[% direction | html %]">
292
                                            <th class="sorting_[% direction | html %]" data-colname="title">
292
                                        [% ELSE %]
293
                                        [% ELSE %]
293
                                            <th class="sorting">
294
                                            <th class="sorting" data-colname="title">
294
                                        [% END %]
295
                                        [% END %]
295
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=title&amp;direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | uri %][% END %]">Title</a>
296
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=title&amp;direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | uri %][% END %]">Title</a>
296
                                        </th>
297
                                        </th>
297
                                        [% IF sortfield == 'author' %]
298
                                        [% IF sortfield == 'author' %]
298
                                            <th class="sorting_[% direction | html %]">
299
                                            <th class="sorting_[% direction | html %]" data-colname="author">
299
                                        [% ELSE %]
300
                                        [% ELSE %]
300
                                            <th class="sorting">
301
                                            <th class="sorting" data-colname="author">
301
                                        [% END %]
302
                                        [% END %]
302
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=author&amp;direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | uri %][% END %]">Author</a>
303
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=author&amp;direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | uri %][% END %]">Author</a>
303
                                        </th>
304
                                        </th>
304
                                        [% IF sortfield == 'dateadded' %]
305
                                        [% IF sortfield == 'dateadded' %]
305
                                            <th class="sorting_[% direction | html %]">
306
                                            <th class="sorting_[% direction | html %]" data-colname="date_added">
306
                                        [% ELSE %]
307
                                        [% ELSE %]
307
                                            <th class="sorting">
308
                                            <th class="sorting" data-colname="date_added">
308
                                        [% END %]
309
                                        [% END %]
309
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=dateadded&amp;direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date added</a>
310
                                            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]&amp;sortfield=dateadded&amp;direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date added</a>
310
                                        </th>
311
                                        </th>
311
                                        [% IF sortfield == 'itemcallnumber' %]
312
                                        [% IF sortfield == 'itemcallnumber' %]
312
                                            <th class="sorting_[% direction | html %]">
313
                                            <th class="sorting_[% direction | html %]" data-colname="call_number">
313
                                        [% ELSE %]
314
                                        [% ELSE %]
314
                                            <th class="sorting">
315
                                            <th class="sorting" data-colname="call_number">
315
                                        [% END %]
316
                                        [% 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>
317
                                            <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>
318
                                        </th>
318
                                    </tr>
319
                                    </tr>
319
                                </thead>
320
                                </thead>
320
                                [% FOREACH itemsloo IN itemsloop %]
321
                                </tbody>
321
                                    <tr>
322
                                    [% FOREACH itemsloo IN itemsloop %]
322
                                        [% IF itemsloop %]
323
                                        <tr>
323
                                            <td>
324
                                            [% IF itemsloop %]
324
                                                <input type="checkbox" class="selection" value="[% itemsloo.biblionumber | html %]" name="biblionumber" />
325
                                                <td>
325
                                            </td>
326
                                                    <input type="checkbox" class="selection" value="[% itemsloo.biblionumber | html %]" name="biblionumber" />
326
                                        [% END %]
327
                                                </td>
327
                                        [% UNLESS ( item_level_itypes ) %]
328
                                            <td>
329
                                                [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]
330
                                                    <img src="[% itemsloo.imageurl | html %]" alt="[% itemsloo.description | html %]" title="[% itemsloo.description | html %]" />
331
                                                [% END %]
332
                                                <span class="itypetext">[% itemsloo.description | html %]</span>
333
                                            </td>
334
                                        [% END %]
335
                                        <td>
336
                                            [% IF ( itemsloo.XSLTBloc ) %]
337
                                                [% itemsloo.XSLTBloc | $raw %]
338
                                            [% ELSE %]
339
                                                [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %]
340
                                                </a>
341
                                            [% END %]
328
                                            [% END %]
342
                                            <p class="hold">
329
                                            [% UNLESS ( item_level_itypes ) %]
343
                                                [% IF ( itemsloo.notforloan ) %]
330
                                                <td>
344
                                                    <span class="noholdstext">No holds allowed</span>
331
                                                    [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]
345
                                                [% ELSE %]
332
                                                        <img src="[% itemsloo.imageurl | html %]" alt="[% itemsloo.description | html %]" title="[% itemsloo.description | html %]" />
346
                                                    [% IF ( itemsloo.ITEM_RESULTS.count ) %]
347
                                                        <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
348
                                                        [% IF ( holdfor ) %]
349
                                                            <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>
350
                                                        [% END %]
351
                                                    [% ELSE %]
352
                                                        <span class="noholdstext">No holds allowed</span>
353
                                                    [% END %]
333
                                                    [% END %]
334
                                                    <span class="itypetext">[% itemsloo.description | html %]</span>
335
                                                </td>
336
                                            [% END %]
337
                                            <td>
338
                                                [% IF ( itemsloo.XSLTBloc ) %]
339
                                                    [% itemsloo.XSLTBloc | $raw %]
340
                                                [% ELSE %]
341
                                                    [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %]
342
                                                    </a>
354
                                                [% END %]
343
                                                [% END %]
355
                                                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
344
                                                <p class="hold">
356
                                                    | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
345
                                                    [% IF ( itemsloo.notforloan ) %]
357
                                                [% END %]
346
                                                        <span class="noholdstext">No holds allowed</span>
358
                                                [% IF ( CAN_user_editcatalogue_edit_items ) %]
347
                                                    [% ELSE %]
359
                                                    | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
348
                                                        [% IF ( itemsloo.ITEM_RESULTS.count ) %]
360
                                                [% END %]
349
                                                            <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
361
                                            </p>
350
                                                            [% IF ( holdfor ) %]
362
                                        </td>
351
                                                                <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>
363
                                        <td>
352
                                                            [% END %]
364
                                            [% itemsloo.author | html %]
353
                                                        [% ELSE %]
365
                                        </td>
354
                                                            <span class="noholdstext">No holds allowed</span>
366
                                        <td>
367
                                            [% itemsloo.dateadded | $KohaDates%]
368
                                        </td>
369
                                        <td>
370
                                            <ul>
371
                                                [% FOREACH item IN itemsloo.ITEM_RESULTS %]
372
                                                    <li>
373
                                                        [% Branches.GetName(item.holdingbranch) | html %]
374
                                                        [% IF ( item.location ) %]
375
                                                            <span class="shelvingloc">
376
                                                                [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
377
                                                            </span>
378
                                                        [% END %]
379
                                                        [% IF ( item.itemcallnumber ) %]
380
                                                            [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% item.itemcallnumber | uri %]%22">[% item.itemcallnumber | html %]</a>]
381
                                                        [% END %]
355
                                                        [% END %]
382
                                                    </li>
356
                                                    [% END %]
383
                                                [% END # /FOREACH item %]
357
                                                    [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
384
                                            </ul>
358
                                                        | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
385
                                        </td>
359
                                                    [% END %]
386
                                    </tr>
360
                                                    [% IF ( CAN_user_editcatalogue_edit_items ) %]
387
                                [% END #/FOREACH itemsloo %]
361
                                                        | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
362
                                                    [% END %]
363
                                                </p>
364
                                            </td>
365
                                            <td>
366
                                                [% itemsloo.author | html %]
367
                                            </td>
368
                                            <td>
369
                                                [% itemsloo.dateadded | $KohaDates%]
370
                                            </td>
371
                                            <td data-sort="[% item.itemcallnumber | html %]">
372
                                                <ul>
373
                                                    [% FOREACH item IN itemsloo.ITEM_RESULTS %]
374
                                                        <li>
375
                                                            [% Branches.GetName(item.holdingbranch) | html %]
376
                                                            [% IF ( item.location ) %]
377
                                                                <span class="shelvingloc">
378
                                                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
379
                                                                </span>
380
                                                            [% END %]
381
                                                            [% IF ( item.itemcallnumber ) %]
382
                                                                [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% item.itemcallnumber | uri %]%22">[% item.itemcallnumber | html %]</a>]
383
                                                            [% END %]
384
                                                        </li>
385
                                                    [% END # /FOREACH item %]
386
                                                </ul>
387
                                            </td>
388
                                        </tr>
389
                                    [% END #/FOREACH itemsloo %]
390
                                </tbody>
388
                            </table> <!-- /#searchresults -->
391
                            </table> <!-- /#searchresults -->
389
                        </div> <!-- /.page-section -->
392
                        </div> <!-- /.page-section -->
390
393
Lines 598-603 Link Here
598
601
599
[% MACRO jsinclude BLOCK %]
602
[% MACRO jsinclude BLOCK %]
600
    [% INCLUDE 'datatables.inc' %]
603
    [% INCLUDE 'datatables.inc' %]
604
    [% INCLUDE 'columns_settings.inc' %]
601
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
605
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
602
    [% IF print %]
606
    [% IF print %]
603
        <script>
607
        <script>
Lines 704-709 Link Here
704
        [% IF shelf AND op == 'view' %]
708
        [% IF shelf AND op == 'view' %]
705
            var Sticky;
709
            var Sticky;
706
            $(document).ready(function(){
710
            $(document).ready(function(){
711
                var table_settings = [% TablesSettings.GetTableSettings( 'virtualshelves', 'lists', 'searchresults', 'json' ) | $raw %];
712
                KohaTable("searchresults", {
713
                    'bPaginate': false,
714
                    "bKohaColumnsUseNames": true,
715
                }, table_settings );
716
707
                Sticky = $("#searchheader");
717
                Sticky = $("#searchheader");
708
                Sticky.hcSticky({
718
                Sticky.hcSticky({
709
                    stickTo: "#listform",
719
                    stickTo: "#listform",
710
- 

Return to bug 30031