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

(-)a/admin/columns_settings.yml (+21 lines)
Lines 893-898 modules: Link Here
893
              cannot_be_toggled: 1
893
              cannot_be_toggled: 1
894
              cannot_be_modified: 1
894
              cannot_be_modified: 1
895
895
896
  virtualshelves:
897
    lists:
898
      searchresults:
899
        columns:
900
            -
901
              columnname: checkbox
902
              cannot_be_toggled: 1
903
              cannot_be_modified: 1
904
            -
905
              columnname: item_type
906
            -
907
              columnname: title
908
              cannot_be_toggled: 1
909
              cannot_be_modified: 1
910
            -
911
              columnname: author
912
            -
913
              columnname: date_added
914
            -
915
              columnname: call_number
916
896
  members:
917
  members:
897
    fines:
918
    fines:
898
      account-fines:
919
      account-fines:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (+16 lines)
Lines 353-358 Link Here
353
                                    </div> <!-- /.panel-collapse -->
353
                                    </div> <!-- /.panel-collapse -->
354
                                </div>
354
                                </div>
355
355
356
                                <div class="panel panel-default">
357
                                    <div class="panel-heading" role="tab" id="virtualshelvesHeading">
358
                                        <h2 class="panel-title">
359
                                            <a id="virtualshelvesToggle" class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#virtualshelves" aria-expanded="false" aria-controls="collapseOne">
360
                                                Lists
361
                                            </a>
362
                                        </h2>
363
                                    </div> <!-- /.panel-heading -->
364
                                    <div id="virtualshelves" class="panel-collapse collapse" role="tabpanel" aria-labelledby="virtualshelvesHeading">
365
                                        <div class="panel-body">
366
                                            <h3>Lists tables</h3>
367
                                            [% PROCESS pagelist module=modules.virtualshelves modulename="virtualshelves" %]
368
                                        </div> <!-- /.panel-body -->
369
                                    </div> <!-- /.panel-collapse -->
370
                                </div>
371
356
                                <div class="panel panel-default">
372
                                <div class="panel panel-default">
357
                                    <div class="panel-heading" role="tab" id="membersHeading">
373
                                    <div class="panel-heading" role="tab" id="membersHeading">
358
                                        <h2 class="panel-title">
374
                                        <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 281-389 Link Here
281
                                <thead>
282
                                <thead>
282
                                    <tr>
283
                                    <tr>
283
                                        [% IF ( itemsloop ) %]
284
                                        [% IF ( itemsloop ) %]
284
                                            <th class="checkall">&nbsp;</th>
285
                                            <th class="checkall" data-colname="checkbox">&nbsp;</th>
285
                                        [% END %]
286
                                        [% END %]
286
                                        [% UNLESS ( item_level_itypes ) %]
287
                                        [% UNLESS ( item_level_itypes ) %]
287
                                            <th>Item type</th>
288
                                            <th data-colname="item_type">Item type</th>
288
                                        [% END %]
289
                                        [% END %]
289
                                        [% IF sortfield == 'title' %]
290
                                        [% IF sortfield == 'title' %]
290
                                            <th class="sorting_[% direction | html %]">
291
                                            <th class="sorting_[% direction | html %]" data-colname="title">
291
                                        [% ELSE %]
292
                                        [% ELSE %]
292
                                            <th class="sorting">
293
                                            <th class="sorting" data-colname="title">
293
                                        [% END %]
294
                                        [% END %]
294
                                            <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>
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>
295
                                        </th>
296
                                        </th>
296
                                        [% IF sortfield == 'author' %]
297
                                        [% IF sortfield == 'author' %]
297
                                            <th class="sorting_[% direction | html %]">
298
                                            <th class="sorting_[% direction | html %]" data-colname="author">
298
                                        [% ELSE %]
299
                                        [% ELSE %]
299
                                            <th class="sorting">
300
                                            <th class="sorting" data-colname="author">
300
                                        [% END %]
301
                                        [% END %]
301
                                            <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>
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>
302
                                        </th>
303
                                        </th>
303
                                        [% IF sortfield == 'dateadded' %]
304
                                        [% IF sortfield == 'dateadded' %]
304
                                            <th class="sorting_[% direction | html %]">
305
                                            <th class="sorting_[% direction | html %]" data-colname="date_added">
305
                                        [% ELSE %]
306
                                        [% ELSE %]
306
                                            <th class="sorting">
307
                                            <th class="sorting" data-colname="date_added">
307
                                        [% END %]
308
                                        [% END %]
308
                                            <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>
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>
309
                                        </th>
310
                                        </th>
310
                                        [% IF sortfield == 'itemcallnumber' %]
311
                                        [% IF sortfield == 'itemcallnumber' %]
311
                                            <th class="sorting_[% direction | html %]">
312
                                            <th class="sorting_[% direction | html %]" data-colname="call_number">
312
                                        [% ELSE %]
313
                                        [% ELSE %]
313
                                            <th class="sorting">
314
                                            <th class="sorting" data-colname="call_number">
314
                                        [% END %]
315
                                        [% END %]
315
                                            <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>
316
                                        </th>
317
                                        </th>
317
                                    </tr>
318
                                    </tr>
318
                                </thead>
319
                                </thead>
319
                                [% FOREACH itemsloo IN itemsloop %]
320
                                </tbody>
320
                                    <tr>
321
                                    [% FOREACH itemsloo IN itemsloop %]
321
                                        [% IF itemsloop %]
322
                                        <tr>
322
                                            <td>
323
                                            [% IF itemsloop %]
323
                                                <input type="checkbox" class="selection" value="[% itemsloo.biblionumber | html %]" name="biblionumber" />
324
                                                <td>
324
                                            </td>
325
                                                    <input type="checkbox" class="selection" value="[% itemsloo.biblionumber | html %]" name="biblionumber" />
325
                                        [% END %]
326
                                                </td>
326
                                        [% UNLESS ( item_level_itypes ) %]
327
                                            <td>
328
                                                [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]
329
                                                    <img src="[% itemsloo.imageurl | html %]" alt="[% itemsloo.description | html %]" title="[% itemsloo.description | html %]" />
330
                                                [% END %]
331
                                                <span class="itypetext">[% itemsloo.description | html %]</span>
332
                                            </td>
333
                                        [% END %]
334
                                        <td>
335
                                            [% IF ( itemsloo.XSLTBloc ) %]
336
                                                [% itemsloo.XSLTBloc | $raw %]
337
                                            [% ELSE %]
338
                                                [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %]
339
                                                </a>
340
                                            [% END %]
327
                                            [% END %]
341
                                            <p class="hold">
328
                                            [% UNLESS ( item_level_itypes ) %]
342
                                                [% IF ( itemsloo.notforloan ) %]
329
                                                <td>
343
                                                    <span class="noholdstext">No holds allowed</span>
330
                                                    [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]
344
                                                [% ELSE %]
331
                                                        <img src="[% itemsloo.imageurl | html %]" alt="[% itemsloo.description | html %]" title="[% itemsloo.description | html %]" />
345
                                                    [% IF ( itemsloo.ITEM_RESULTS.count ) %]
346
                                                        <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
347
                                                        [% IF ( holdfor ) %]
348
                                                            <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>
349
                                                        [% END %]
350
                                                    [% ELSE %]
351
                                                        <span class="noholdstext">No holds allowed</span>
352
                                                    [% END %]
332
                                                    [% END %]
333
                                                    <span class="itypetext">[% itemsloo.description | html %]</span>
334
                                                </td>
335
                                            [% END %]
336
                                            <td>
337
                                                [% IF ( itemsloo.XSLTBloc ) %]
338
                                                    [% itemsloo.XSLTBloc | $raw %]
339
                                                [% ELSE %]
340
                                                    [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %]
341
                                                    </a>
353
                                                [% END %]
342
                                                [% END %]
354
                                                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
343
                                                <p class="hold">
355
                                                    | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
344
                                                    [% IF ( itemsloo.notforloan ) %]
356
                                                [% END %]
345
                                                        <span class="noholdstext">No holds allowed</span>
357
                                                [% IF ( CAN_user_editcatalogue_edit_items ) %]
346
                                                    [% ELSE %]
358
                                                    | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
347
                                                        [% IF ( itemsloo.ITEM_RESULTS.count ) %]
359
                                                [% END %]
348
                                                            <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
360
                                            </p>
349
                                                            [% IF ( holdfor ) %]
361
                                        </td>
350
                                                                <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>
362
                                        <td>
351
                                                            [% END %]
363
                                            [% itemsloo.author | html %]
352
                                                        [% ELSE %]
364
                                        </td>
353
                                                            <span class="noholdstext">No holds allowed</span>
365
                                        <td>
366
                                            [% itemsloo.dateadded | $KohaDates%]
367
                                        </td>
368
                                        <td>
369
                                            <ul>
370
                                                [% FOREACH item IN itemsloo.ITEM_RESULTS %]
371
                                                    <li>
372
                                                        [% Branches.GetName(item.holdingbranch) | html %]
373
                                                        [% IF ( item.location ) %]
374
                                                            <span class="shelvingloc">
375
                                                                [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
376
                                                            </span>
377
                                                        [% END %]
378
                                                        [% IF ( item.itemcallnumber ) %]
379
                                                            [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% item.itemcallnumber | uri %]%22">[% item.itemcallnumber | html %]</a>]
380
                                                        [% END %]
354
                                                        [% END %]
381
                                                    </li>
355
                                                    [% END %]
382
                                                [% END # /FOREACH item %]
356
                                                    [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
383
                                            </ul>
357
                                                        | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a>
384
                                        </td>
358
                                                    [% END %]
385
                                    </tr>
359
                                                    [% IF ( CAN_user_editcatalogue_edit_items ) %]
386
                                [% END #/FOREACH itemsloo %]
360
                                                        | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a>
361
                                                    [% END %]
362
                                                </p>
363
                                            </td>
364
                                            <td>
365
                                                [% itemsloo.author | html %]
366
                                            </td>
367
                                            <td>
368
                                                [% itemsloo.dateadded | $KohaDates%]
369
                                            </td>
370
                                            <td data-sort="[% item.itemcallnumber | html %]">
371
                                                <ul>
372
                                                    [% FOREACH item IN itemsloo.ITEM_RESULTS %]
373
                                                        <li>
374
                                                            [% Branches.GetName(item.holdingbranch) | html %]
375
                                                            [% IF ( item.location ) %]
376
                                                                <span class="shelvingloc">
377
                                                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]
378
                                                                </span>
379
                                                            [% END %]
380
                                                            [% IF ( item.itemcallnumber ) %]
381
                                                                [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% item.itemcallnumber | uri %]%22">[% item.itemcallnumber | html %]</a>]
382
                                                            [% END %]
383
                                                        </li>
384
                                                    [% END # /FOREACH item %]
385
                                                </ul>
386
                                            </td>
387
                                        </tr>
388
                                    [% END #/FOREACH itemsloo %]
389
                                </tbody>
387
                            </table> <!-- /#searchresults -->
390
                            </table> <!-- /#searchresults -->
388
                        </div> <!-- /.page-section -->
391
                        </div> <!-- /.page-section -->
389
392
Lines 597-602 Link Here
597
600
598
[% MACRO jsinclude BLOCK %]
601
[% MACRO jsinclude BLOCK %]
599
    [% INCLUDE 'datatables.inc' %]
602
    [% INCLUDE 'datatables.inc' %]
603
    [% INCLUDE 'columns_settings.inc' %]
600
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
604
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %]
601
    [% IF print %]
605
    [% IF print %]
602
        <script>
606
        <script>
Lines 725-730 Link Here
725
        [% IF shelf AND op == 'view' %]
729
        [% IF shelf AND op == 'view' %]
726
            var Sticky;
730
            var Sticky;
727
            $(document).ready(function(){
731
            $(document).ready(function(){
732
                var table_settings = [% TablesSettings.GetTableSettings( 'virtualshelves', 'lists', 'searchresults', 'json' ) | $raw %];
733
                KohaTable("searchresults", {
734
                    'bPaginate': false,
735
                    "bKohaColumnsUseNames": true,
736
                }, table_settings );
737
728
                Sticky = $("#searchheader");
738
                Sticky = $("#searchheader");
729
                Sticky.hcSticky({
739
                Sticky.hcSticky({
730
                    stickTo: "#listform",
740
                    stickTo: "#listform",
731
- 

Return to bug 30031