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

(-)a/admin/columns_settings.yml (+18 lines)
Lines 573-578 modules: Link Here
573
              cannot_be_toggled: 1
573
              cannot_be_toggled: 1
574
              cannot_be_modified: 1
574
              cannot_be_modified: 1
575
575
576
    concerns:
577
      table_concerns:
578
        default_sort_order: 0
579
        columns:
580
            -
581
              columnname: reported
582
            -
583
              columnname: details
584
            -
585
              columnname: title
586
              is_hidden: 1
587
            -
588
              columnname: status
589
            -
590
              columnname: actions
591
              cannot_be_toggled: 1
592
              cannot_be_modified: 1
593
576
  cataloguing:
594
  cataloguing:
577
    addbooks:
595
    addbooks:
578
      reservoir-table:
596
      reservoir-table:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-5 / +32 lines)
Lines 673-678 Link Here
673
            <tr>
673
            <tr>
674
                <th>Reported</th>
674
                <th>Reported</th>
675
                <th>Details</th>
675
                <th>Details</th>
676
                <th>Title</th>
676
                <th>Status</th>
677
                <th>Status</th>
677
                <th data-class-name="actions noExport">Actions</th>
678
                <th data-class-name="actions noExport">Actions</th>
678
            </tr>
679
            </tr>
Lines 1024-1030 Link Here
1024
     [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %]
1025
     [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %]
1025
         <script>
1026
         <script>
1026
            $(document).ready(function() {
1027
            $(document).ready(function() {
1027
                var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'concerns', 'table_concerns', 'json' ) | $raw %];
1028
                var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'concerns', 'table_concerns', 'json' ) | $raw %];
1028
1029
1029
                var filtered = false;
1030
                var filtered = false;
1030
                let additional_filters = {
1031
                let additional_filters = {
Lines 1045-1057 Link Here
1045
                        "url": tickets_url
1046
                        "url": tickets_url
1046
                    },
1047
                    },
1047
                    "embed": [
1048
                    "embed": [
1049
                        "assignee",
1048
                        "reporter",
1050
                        "reporter",
1049
                        "resolver",
1051
                        "resolver",
1052
                        "biblio",
1050
                        "updates+count",
1053
                        "updates+count",
1054
                        "+strings"
1051
                    ],
1055
                    ],
1052
                    'emptyTable': '<div class="dialog message">' + _("Congratulations, there are no catalog concerns.") + '</div>',
1056
                    'emptyTable': '<div class="dialog message">' + _("Congratulations, there are no catalog concerns.") + '</div>',
1053
                    "columnDefs": [ {
1057
                    "columnDefs": [ {
1054
                        "targets": [0,1,2],
1058
                        "targets": [0,1,2,3],
1055
                        "render": function (data, type, row, meta) {
1059
                        "render": function (data, type, row, meta) {
1056
                            if ( type == 'display' ) {
1060
                            if ( type == 'display' ) {
1057
                                if ( data != null ) {
1061
                                if ( data != null ) {
Lines 1093-1099 Link Here
1093
                            "orderable": true
1097
                            "orderable": true
1094
                        },
1098
                        },
1095
                        {
1099
                        {
1096
                            "data": "resolved_date",
1100
                            "data": "biblio.title",
1101
                            "render": function(data, type, row, meta) {
1102
                                return $biblio_to_html(row.biblio, {
1103
                                    link: 1
1104
                                });
1105
                            },
1106
                            "searchable": true,
1107
                            "orderable": true
1108
                        },
1109
                        {
1110
                            "data": "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status",
1097
                            "render": function(data, type, row, meta) {
1111
                            "render": function(data, type, row, meta) {
1098
                                let result = '';
1112
                                let result = '';
1099
                                if (row.resolved_date) {
1113
                                if (row.resolved_date) {
Lines 1101-1109 Link Here
1101
                                        display_cardnumber: false,
1115
                                        display_cardnumber: false,
1102
                                        url: true
1116
                                        url: true
1103
                                    }) + '</span>';
1117
                                    }) + '</span>';
1118
                                    if (row.status) {
1119
                                        result += ' ' + _("as") + ' ';
1120
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1121
                                    }
1104
                                    result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
1122
                                    result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
1105
                                } else {
1123
                                } else {
1106
                                    result += _("Open");
1124
                                    if (row.status) {
1125
                                        result += row._strings.status ? escape_str(row._strings.status.str) : "";
1126
                                    } else {
1127
                                        result += _("Open");
1128
                                    }
1129
                                    if (row.assignee) {
1130
                                        result += '<span class="clearfix">' + _("Assigned to: ") + $patron_to_html(row.assignee, {
1131
                                            display_cardnumber: false,
1132
                                            url: true
1133
                                        }) + '</span>';
1134
                                    }
1107
                                }
1135
                                }
1108
                                return result;
1136
                                return result;
1109
                            },
1137
                            },
1110
- 

Return to bug 36757