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

(-)a/admin/columns_settings.yml (-3 / +118 lines)
Lines 1072-1082 modules: Link Here
1072
    usage_data_providers:
1072
    usage_data_providers:
1073
      usage_data_providers:
1073
      usage_data_providers:
1074
        columns:
1074
        columns:
1075
            - 
1075
            -
1076
              columnname: name
1076
              columnname: name
1077
            -
1077
            -
1078
              columnname: description
1078
              columnname: description
1079
            - 
1079
            -
1080
              columnname: actions
1080
              columnname: actions
1081
              cannot_be_toggled: 1
1081
              cannot_be_toggled: 1
1082
              cannot_be_modified: 1
1082
              cannot_be_modified: 1
Lines 1094-1100 modules: Link Here
1094
              columnname: filename
1094
              columnname: filename
1095
            -
1095
            -
1096
              columnname: importdate
1096
              columnname: importdate
1097
            - 
1097
            -
1098
              columnname: actions
1098
              columnname: actions
1099
              cannot_be_toggled: 1
1099
              cannot_be_toggled: 1
1100
              cannot_be_modified: 1
1100
              cannot_be_modified: 1
Lines 1687-1692 modules: Link Here
1687
              cannot_be_modified: 1
1687
              cannot_be_modified: 1
1688
1688
1689
  circ:
1689
  circ:
1690
    article-requests:
1691
      article-requests-requested-table:
1692
        default_sort_order: 13
1693
        columns:
1694
            -
1695
              columnname: selections
1696
              cannot_be_toggled: 1
1697
              cannot_be_modified: 1
1698
            -
1699
              columnname: title
1700
            -
1701
              columnname: requested_article
1702
            -
1703
              columnname: collection
1704
            -
1705
              columnname: item_type
1706
            -
1707
              columnname: call_number
1708
            -
1709
              columnname: status
1710
            -
1711
              columnname: copy_number
1712
            -
1713
              columnname: enumeration
1714
            -
1715
              columnname: barcode
1716
            -
1717
              columnname: format
1718
            -
1719
              columnname: urls
1720
            -
1721
              columnname: patron
1722
            -
1723
              columnname: date
1724
            -
1725
              columnname: actions
1726
              cannot_be_toggled: 1
1727
              cannot_be_modified: 1
1728
1729
      article-requests-pending-table:
1730
        default_sort_order: 13
1731
        columns:
1732
            -
1733
              columnname: selections
1734
              cannot_be_toggled: 1
1735
              cannot_be_modified: 1
1736
            -
1737
              columnname: title
1738
            -
1739
              columnname: requested_article
1740
            -
1741
              columnname: collection
1742
            -
1743
              columnname: item_type
1744
            -
1745
              columnname: call_number
1746
            -
1747
              columnname: status
1748
            -
1749
              columnname: copy_number
1750
            -
1751
              columnname: enumeration
1752
            -
1753
              columnname: barcode
1754
            -
1755
              columnname: format
1756
            -
1757
              columnname: urls
1758
            -
1759
              columnname: patron
1760
            -
1761
              columnname: date
1762
            -
1763
              columnname: actions
1764
              cannot_be_toggled: 1
1765
              cannot_be_modified: 1
1766
1767
      article-requests-processing-table:
1768
        default_sort_order: 13
1769
        columns:
1770
            -
1771
              columnname: selections
1772
              cannot_be_toggled: 1
1773
              cannot_be_modified: 1
1774
            -
1775
              columnname: title
1776
            -
1777
              columnname: requested_article
1778
            -
1779
              columnname: collection
1780
            -
1781
              columnname: item_type
1782
            -
1783
              columnname: call_number
1784
            -
1785
              columnname: status
1786
            -
1787
              columnname: copy_number
1788
            -
1789
              columnname: enumeration
1790
            -
1791
              columnname: barcode
1792
            -
1793
              columnname: format
1794
            -
1795
              columnname: urls
1796
            -
1797
              columnname: patron
1798
            -
1799
              columnname: date
1800
            -
1801
              columnname: actions
1802
              cannot_be_toggled: 1
1803
              cannot_be_modified: 1
1804
1690
    circulation:
1805
    circulation:
1691
      issues-table:
1806
      issues-table:
1692
        columns:
1807
        columns:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-10 / +14 lines)
Lines 5-10 Link Here
5
[% USE AuthorisedValues %]
5
[% USE AuthorisedValues %]
6
[% USE Asset %]
6
[% USE Asset %]
7
[% USE raw %]
7
[% USE raw %]
8
[% USE TablesSettings %]
8
[% PROCESS 'i18n.inc' %]
9
[% PROCESS 'i18n.inc' %]
9
[% SET footerjs = 1 %]
10
[% SET footerjs = 1 %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
Lines 207-214 Link Here
207
                <table id="article-requests-requested-table">
208
                <table id="article-requests-requested-table">
208
                    <thead>
209
                    <thead>
209
                        <tr>
210
                        <tr>
210
                            <th />
211
                            <th class="no-sort no-export"></th>
211
                            <th class="ar-title">Title</th>
212
                            <th class="ar-title anti-the">Title</th>
212
                            <th class="ar-request">Requested article</th>
213
                            <th class="ar-request">Requested article</th>
213
                            <th class="ar-collection">Collection</th>
214
                            <th class="ar-collection">Collection</th>
214
                            <th class="ar-itemtype">Item type</th>
215
                            <th class="ar-itemtype">Item type</th>
Lines 314-321 Link Here
314
                <table id="article-requests-pending-table">
315
                <table id="article-requests-pending-table">
315
                    <thead>
316
                    <thead>
316
                        <tr>
317
                        <tr>
317
                            <th />
318
                            <th class="no-export no-sort"> </th>
318
                            <th class="ar-title">Title</th>
319
                            <th class="ar-title anti-the">Title</th>
319
                            <th class="ar-request">Requested article</th>
320
                            <th class="ar-request">Requested article</th>
320
                            <th class="ar-collection">Collection</th>
321
                            <th class="ar-collection">Collection</th>
321
                            <th class="ar-itemtype">Item type</th>
322
                            <th class="ar-itemtype">Item type</th>
Lines 420-427 Link Here
420
                <table id="article-requests-processing-table">
421
                <table id="article-requests-processing-table">
421
                    <thead>
422
                    <thead>
422
                        <tr>
423
                        <tr>
423
                            <th />
424
                            <th class="no-export no-sort"> </th>
424
                            <th class="ar-title">Title</th>
425
                            <th class="ar-title anti-the">Title</th>
425
                            <th class="ar-request">Requested article</th>
426
                            <th class="ar-request">Requested article</th>
426
                            <th class="ar-collection">Collection</th>
427
                            <th class="ar-collection">Collection</th>
427
                            <th class="ar-itemtype">Item type</th>
428
                            <th class="ar-itemtype">Item type</th>
Lines 574-586 Link Here
574
                if( link.length > 0 ) link[0].focus();
575
                if( link.length > 0 ) link[0].focus();
575
            });
576
            });
576
577
577
            requested_datatable = $("#article-requests-requested-table").kohaTable();
578
            let requested_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-requested-table', 'json' ) | $raw %]
579
            let pending_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-pending-table', 'json' ) | $raw %]
580
            let processing_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-processing-table', 'json' ) | $raw %]
581
582
            requested_datatable = $("#article-requests-requested-table").kohaTable({}, requested_table_settings);
578
            requested_dt = requested_datatable.DataTable();
583
            requested_dt = requested_datatable.DataTable();
579
584
580
            pending_datatable = $("#article-requests-pending-table").kohaTable();
585
            pending_datatable = $("#article-requests-pending-table").kohaTable({}, pending_table_settings);
581
            pending_dt = pending_datatable.DataTable();
586
            pending_dt = pending_datatable.DataTable();
582
587
583
            processing_datatable = $("#article-requests-processing-table").kohaTable();
588
            processing_datatable = $("#article-requests-processing-table").kohaTable({}, processing_table_settings);
584
            processing_dt = processing_datatable.DataTable();
589
            processing_dt = processing_datatable.DataTable();
585
590
586
            active_datatable = requested_datatable;
591
            active_datatable = requested_datatable;
587
- 

Return to bug 40086