Attachment 79183 Details for Bug 20600 – Bug 20600: (follow-up) Fix bad rebase

[patch] Bug 20600: (follow-up) Fix bad rebase

Bug-20600-follow-up-Fix-bad-rebase.patch (text/plain), 20.12 KB, created by Owen Leonard on 2018-09-20 16:02:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-09-20 16:02:25 UTC

Size: 20.12 KB

patch

obsolete

>From c5264a49495ac9db5bb6c684a2899fa4122ba888 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Thu, 6 Sep 2018 12:24:03 +0100
>Subject: [PATCH] Bug 20600: (follow-up) Fix bad rebase
>
>Rebasing didn't do the right thing, so this patch fixes it
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/ill/ill-requests.tt            | 487 +--------------------
> 1 file changed, 2 insertions(+), 485 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index d6c7590..f103fb2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -7,491 +7,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; ILL requests</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
> [% Asset.css("css/datatables.css") | $raw %]
>-[% INCLUDE 'datatables.inc' %]
>-[% INCLUDE 'calendar.inc' %]
>-<script type="text/javascript">
>-    //<![CDATA[
>-    $(document).ready(function() {
>-
>-        // Illview Datatable setup
>-
>-        var table;
>-
>-        // Filters that are active
>-        var activeFilters = {};
>-
>-        // Fields we don't want to display
>-        var ignore = [
>-            'accessurl',
>-            'backend',
>-            'branchcode',
>-            'completed',
>-            'capabilities',
>-            'cost',
>-            'medium',
>-            'notesopac',
>-            'notesstaff',
>-            'replied'
>-        ];
>-
>-        // Fields we need to expand (flatten)
>-        var expand = [
>-            'metadata',
>-            'patron'
>-        ];
>-
>-        // Expanded fields
>-        // This is auto populated
>-        var expanded = {};
>-
>-        // The core fields that should be displayed first
>-        var core = [
>-            'metadata_Author',
>-            'metadata_Title',
>-            'borrowername',
>-            'patron_cardnumber',
>-            'biblio_id',
>-            'library',
>-            'status',
>-            'placed',
>-            'placed_formatted',
>-            'updated',
>-            'updated_formatted',
>-            'illrequest_id',
>-            'action'
>-        ];
>-
>-        // Filterable columns
>-        var filterable = {
>-            status: {
>-                prep: function(tableData, oData) {
>-                    var uniques = {};
>-                    tableData.forEach(function(row) {
>-                        var resolvedName = getStatusName(
>-                            oData[0].capabilities[row.status].name
>-                        );
>-                        uniques[resolvedName] = 1
>-                    });
>-                    Object.keys(uniques).sort().forEach(function(unique) {
>-                        $('#illfilter_status').append(
>-                            '<option value="' + unique  +
>-                            '">' + unique +  '</option>'
>-                        );
>-                    });
>-                },
>-                listener: function() {
>-                    var me = 'status';
>-                    $('#illfilter_status').change(function() {
>-                        var sel = $('#illfilter_status option:selected').val();
>-                        if (sel && sel.length > 0) {
>-                            activeFilters[me] = function() {
>-                                table.column(6).search(sel);
>-                            }
>-                        } else {
>-                            if (activeFilters.hasOwnProperty(me)) {
>-                                delete activeFilters[me];
>-                            }
>-                        }
>-                    });
>-                },
>-                clear: function() {
>-                    $('#illfilter_status').val('');
>-                }
>-            },
>-            pickupBranch: {
>-                prep: function(tableData, oData) {
>-                    var uniques = {};
>-                    tableData.forEach(function(row) {
>-                        uniques[row.library.branchname] = 1
>-                    });
>-                    Object.keys(uniques).sort().forEach(function(unique) {
>-                        $('#illfilter_branchname').append(
>-                            '<option value="' + unique  +
>-                            '">' + unique +  '</option>'
>-                        );
>-                    });
>-                },
>-                listener: function() {
>-                    var me = 'pickupBranch';
>-                    $('#illfilter_branchname').change(function() {
>-                        var sel = $('#illfilter_branchname option:selected').val();
>-                        if (sel && sel.length > 0) {
>-                            activeFilters[me] = function() {
>-                                table.column(5).search(sel);
>-                            }
>-                        } else {
>-                            if (activeFilters.hasOwnProperty(me)) {
>-                                delete activeFilters[me];
>-                            }
>-                        }
>-                    });
>-                },
>-                clear: function() {
>-                    $('#illfilter_branchname').val('');
>-                }
>-            },
>-            barcode: {
>-                listener: function() {
>-                    var me = 'barcode';
>-                    $('#illfilter_barcode').change(function() {
>-                        var val = $('#illfilter_barcode').val();
>-                        if (val && val.length > 0) {
>-                            activeFilters[me] = function() {
>-                                table.column(3).search(val);
>-                            }
>-                        } else {
>-                            if (activeFilters.hasOwnProperty(me)) {
>-                                delete activeFilters[me];
>-                            }
>-                        }
>-                    });
>-                },
>-                clear: function() {
>-                    $('#illfilter_barcode').val('');
>-                }
>-            },
>-            dateModified: {
>-                clear: function() {
>-                    $('#illfilter_datemodified_start, #illfilter_datemodified_end').val('');
>-                }
>-            },
>-            datePlaced: {
>-                clear: function() {
>-                    $('#illfilter_dateplaced_start, #illfilter_dateplaced_end').val('');
>-                }
>-            }
>-        };
>-
>-        // Remove any fields we're ignoring
>-        var removeIgnore = function(dataObj) {
>-            dataObj.forEach(function(thisRow) {
>-                ignore.forEach(function(thisIgnore) {
>-                    if (thisRow.hasOwnProperty(thisIgnore)) {
>-                        delete thisRow[thisIgnore];
>-                    }
>-                });
>-            });
>-        };
>-
>-        // Expand any fields we're expanding
>-        var expandExpand = function(row) {
>-            expand.forEach(function(thisExpand) {
>-                if (row.hasOwnProperty(thisExpand)) {
>-                    if (!expanded.hasOwnProperty(thisExpand)) {
>-                        expanded[thisExpand] = [];
>-                    }
>-                    var expandObj = row[thisExpand];
>-                    Object.keys(expandObj).forEach(
>-                        function(thisExpandCol) {
>-                            var expColName = thisExpand + '_' + thisExpandCol;
>-                            // Keep a list of fields that have been expanded
>-                            // so we can create toggle links for them
>-                            if (expanded[thisExpand].indexOf(expColName) == -1) {
>-                                expanded[thisExpand].push(expColName);
>-                            }
>-                            expandObj[expColName] =
>-                                expandObj[thisExpandCol];
>-                            delete expandObj[thisExpandCol];
>-                        }
>-                    );
>-                    $.extend(true, row, expandObj);
>-                    delete row[thisExpand];
>-                }
>-            });
>-        };
>-
>-        // Build a de-duped list of all column names
>-        var allCols = {};
>-        core.map(function(thisCore) {
>-            allCols[thisCore] = 1;
>-        });
>-
>-        // Strip the expand prefix if it exists, we do this for display
>-        var stripPrefix = function(value) {
>-            expand.forEach(function(thisExpand) {
>-                var regex = new RegExp(thisExpand + '_', 'g');
>-                value = value.replace(regex, '');
>-            });
>-            return value;
>-        };
>-
>-        // Our 'render' function for borrowerlink
>-        var createPatronLink = function(data, type, row) {
>-            return '<a title="' + _("View borrower details") + '" ' +
>-                'href="/cgi-bin/koha/members/moremember.pl?' +
>-                'borrowernumber='+row.borrowernumber+'">' +
>-                row.patron_firstname + ' ' + row.patron_surname +
>-                '</a>';
>-        };
>-
>-        // Our 'render' function for the library name
>-        var createLibrary = function(data, type, row) {
>-            return row.library.branchname;
>-        };
>-
>-        // Render function for request ID
>-        var createRequestId = function(data, type, row) {
>-            return row.id_prefix + row.illrequest_id;
>-        };
>-
>-        // Render function for request status
>-        var createStatus = function(data, type, row, meta) {
>-            var origData = meta.settings.oInit.originalData;
>-            if (origData.length > 0) {
>-                var status_name = meta.settings.oInit.originalData[0].capabilities[
>-                    row.status
>-                ].name;
>-                return getStatusName(status_name);
>-            } else {
>-                return '';
>-            }
>-        };
>-
>-        var getStatusName = function(origName) {
>-            switch( origName ) {
>-                case "New request":
>-                    return _("New request");
>-                case "Requested":
>-                    return _("Requested");
>-                case "Requested from partners":
>-                    return _("Requested from partners");
>-                case "Request reverted":
>-                    return _("Request reverted");
>-                case "Queued request":
>-                    return _("Queued request");
>-                case "Cancellation requested":
>-                    return _("Cancellation requested");
>-                case "Completed":
>-                    return _("Completed");
>-                case "Delete request":
>-                    return _("Delete request");
>-                default:
>-                    return origName;
>-            }
>-        };
>-
>-        // Render function for creating a row's action link
>-        var createActionLink = function(data, type, row) {
>-            return '<a class="btn btn-default btn-sm" ' +
>-                'href="/cgi-bin/koha/ill/ill-requests.pl?' +
>-                'method=illview&amp;illrequest_id=' +
>-                row.illrequest_id +
>-                '">' + _("Manage request") + '</a>';
>-        };
>-
>-        // Columns that require special treatment
>-        var specialCols = {
>-            action: {
>-                name: '',
>-                func: createActionLink
>-            },
>-            borrowername: {
>-                name: _("Patron"),
>-                func: createPatronLink
>-            },
>-            illrequest_id: {
>-                name: _("Request number"),
>-                func: createRequestId
>-            },
>-            status: {
>-                name: _("Status"),
>-                func: createStatus
>-            },
>-            biblio_id: {
>-                name: _("Bibliograpic Record ID")
>-            },
>-            library: {
>-                name: _("Library"),
>-                func: createLibrary
>-            },
>-            updated: {
>-                name: _("Updated on"),
>-            },
>-            patron_cardnumber: {
>-                name: _("Patron barcode")
>-            }
>-        };
>-
>-        // Filter partner list
>-        $('#partner_filter').keyup(function() {
>-            var needle = $('#partner_filter').val();
>-            $('#partners > option').each(function() {
>-                var regex = new RegExp(needle, 'i');
>-                if (
>-                    needle.length == 0 ||
>-                    $(this).is(':selected') ||
>-                    $(this).text().match(regex)
>-                ) {
>-                    $(this).show();
>-                } else {
>-                    $(this).hide();
>-                }
>-            });
>-        });
>-
>-        // Display the modal containing request supplier metadata
>-        $('#ill-request-display-metadata').on('click', function(e) {
>-            e.preventDefault();
>-            $('#dataPreview').modal({show:true});
>-        });
>-
>-        // Get our data from the API and process it prior to passing
>-        // it to datatables
>-        var ajax = $.ajax(
>-            '/api/v1/illrequests?embed=metadata,patron,capabilities,library'
>-            ).done(function() {
>-                var data = JSON.parse(ajax.responseText);
>-                // Make a copy, we'll be removing columns next and need
>-                // to be able to refer to data that has been removed
>-                var dataCopy = $.extend(true, [], data);
>-                // Remove all columns we're not interested in
>-                removeIgnore(dataCopy);
>-                // Expand columns that need it and create an array
>-                // of all column names
>-                $.each(dataCopy, function(k, row) {
>-                    expandExpand(row);
>-                });
>-
>-                // Assemble an array of column definitions for passing
>-                // to datatables
>-                var colData = [];
>-                Object.keys(allCols).forEach(function(thisCol) {
>-                    // Create the base column object
>-                    var colObj = {
>-                        name: thisCol,
>-                        className: thisCol,
>-                        defaultContent: ''
>-                    };
>-                    // We may need to process the data going in this
>-                    // column, so do it if necessary
>-                    if (
>-                        specialCols.hasOwnProperty(thisCol) &&
>-                        specialCols[thisCol].hasOwnProperty('func')
>-                    ) {
>-                        colObj.render = specialCols[thisCol].func;
>-                    } else {
>-                        colObj.data = thisCol;
>-                    }
>-                    colData.push(colObj);
>-                });
>-
>-                // Initialise the datatable
>-                table = $('#ill-requests').DataTable($.extend(true, {}, dataTablesDefaults, {
>-                    'aoColumnDefs': [
>-                        { // Last column shouldn't be sortable or searchable
>-                            'aTargets': [ 'actions' ],
>-                            'bSortable': false,
>-                            'bSearchable': false
>-                        },
>-                        { // Hide the two date columns we use just for sorting
>-                            'aTargets': [ 'placed', 'updated' ],
>-                            'bVisible': false,
>-                            'bSearchable': true
>-                        },
>-                        { // When sorting 'placed', we want to use the
>-                          // unformatted column
>-                          'aTargets': [ 'placed_formatted'],
>-                          'iDataSort': 7
>-                        },
>-                        { // When sorting 'updated', we want to use the
>-                          // unformatted column
>-                          'aTargets': [ 'updated_formatted'],
>-                          'iDataSort': 9
>-                        }
>-                    ],
>-                    'aaSorting': [[ 9, 'desc' ]], // Default sort, updated descending
>-                    'processing': true, // Display a message when manipulating
>-                    'iDisplayLength': 10, // 10 results per page
>-                    'sPaginationType': "full_numbers", // Pagination display
>-                    'deferRender': true, // Improve performance on big datasets
>-                    'data': dataCopy,
>-                    'columns': colData,
>-                    'originalData': data, // Enable render functions to access
>-                                          // our original data
>-                    'initComplete': function() {
>-
>-                        // Prepare any filter elements that need it
>-                        for (var el in filterable) {
>-                            if (filterable.hasOwnProperty(el)) {
>-                                if (filterable[el].hasOwnProperty('prep')) {
>-                                    filterable[el].prep(dataCopy, data);
>-                                }
>-                                if (filterable[el].hasOwnProperty('listener')) {
>-                                    filterable[el].listener();
>-                                }
>-                            }
>-                        }
>-
>-                    }
>-                }));
>-
>-                // Custom date range filtering
>-                $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
>-                    var placedStart = $('#illfilter_dateplaced_start').datepicker('getDate');
>-                    var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate');
>-                    var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate');
>-                    var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate');
>-                    var rowPlaced = data[7] ? new Date(data[7]) : null;
>-                    var rowModified = data[9] ? new Date(data[9]) : null;
>-                    var placedPassed = true;
>-                    var modifiedPassed = true;
>-                    if (placedStart && rowPlaced && rowPlaced < placedStart) {
>-                        placedPassed = false
>-                    };
>-                    if (placedEnd && rowPlaced && rowPlaced > placedEnd) {
>-                        placedPassed = false;
>-                    }
>-                    if (modifiedStart && rowModified && rowModified < modifiedStart) {
>-                        modifiedPassed = false
>-                    };
>-                    if (modifiedEnd && rowModified && rowModified > modifiedEnd) {
>-                        modifiedPassed = false;
>-                    }
>-
>-                    return placedPassed && modifiedPassed;
>-
>-                });
>-
>-            }
>-        );
>-
>-        var clearSearch = function() {
>-            table.search('').columns().search('');
>-            activeFilters = {};
>-            for (var filter in filterable) {
>-                if (
>-                    filterable.hasOwnProperty(filter) &&
>-                    filterable[filter].hasOwnProperty('clear')
>-                ) {
>-                    filterable[filter].clear();
>-                }
>-            }
>-            table.draw();
>-        };
>-
>-        // Apply any search filters, or clear any previous
>-        // ones
>-        $('#illfilter_form').submit(function(event) {
>-            event.preventDefault();
>-            table.search('').columns().search('');
>-            for (var active in activeFilters) {
>-                if (activeFilters.hasOwnProperty(active)) {
>-                    activeFilters[active]();
>-                }
>-            }
>-            table.draw();
>-        });
>-
>-        // Clear all filters
>-        $('#clear_search').click(function() {
>-            clearSearch();
>-        });
>-
>-    });
>-    //]]>
>-</script>
> </head>
> 
> <body id="illrequests" class="ill">
>@@ -899,6 +415,7 @@
> [% MACRO jsinclude BLOCK %]
>     [% INCLUDE 'datatables.inc' %]
>     [% INCLUDE 'calendar.inc' %]
>+    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
>     <script>
>         $(document).ready(function() {
> 
>@@ -1187,7 +704,7 @@
>                     func: createStatus
>                 },
>                 biblio_id: {
>-                    name: _("Biblio ID")
>+                name: _("Bibliograpic Record ID")
>                 },
>                 library: {
>                     name: _("Library"),
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20600: 74640 | 74641 | 75202 | 75276 | 75734 | 75735 | 75753 | 75755 | 75844 | 75845 | 75848 | 75849 | 75850 | 75851 | 75852 | 75853 | 75854 | 75871 | 77691 | 77692 | 77693 | 77694 | 77695 | 77696 | 77697 | 78439 | 78440 | 78441 | 78442 | 78443 | 78444 | 78445 | 78446 | 78463 | 78464 | 78465 | 78466 | 78467 | 78468 | 78469 | 78470 | 79183 | 80468 | 81992 | 81993 | 82032 | 82033 | 82034 | 82035 | 82036 | 82037 | 82038 | 82039 | 82062 | 82170 | 82171 | 82432 | 82433 | 82434 | 82435 | 82436 | 82437 | 82438 | 82439 | 82440 | 82441 | 82442 | 83882 | 83887 | 84736 | 84737 | 84738 | 84739 | 84740 | 84741 | 84742 | 84743 | 84744 | 84745 | 84746 | 84747 | 84748 | 84749 | 85037 | 85038 | 85039 | 85040 | 85041 | 85042 | 85043 | 85044 | 85045 | 85046 | 85047 | 85048 | 85049 | 85050