Bug 1113707

Changed the behaviour to allow server-side sorting on the Resource, Metric, Date/Time and Outlier fields. Rest of the fields are not sortable server-side and have client side sorting only allowed (they will be sortable after all the data has been loaded to the client).

Fixed in master commit 3fa0ecb.

Getting a conflict - need someone know is familiar with this code to cherry pick it over and resolve. The conflict is:

    protected String getSortFieldForColumn(String columnName) {
<<<<<<< HEAD
        // Note: I don't think this should even be getting called, but it is. We already setCanSortClientOnly(true)
        // on all of the ListGridFields. To me that should mean any sorting done client side on those fields should
        // not be passed in on the Request, but it seems to be...

        // we don't use criterias for this datasource, just return null, don't try and apply any sort.        
        return null;
=======
        // Allow server-side sorting for only unmodified queries, these keywords are for MeasurementOOBManagerBean.
        // Rest of the fields should have client-side sorting only.
        String sortField = null;
        if("scheduleName".equals(columnName)) {
            sortField = "def.displayName";
        } else if("resourceName".equals(columnName)) {
            sortField = "res.name";
        } else if("timestamp".equals(columnName)) {
            sortField = "o.timestamp";
        } else if("factor".equals(columnName)) {
            sortField = "o.oobFactor";
        }
        return sortField;
>>>>>>> 3fa0ecb... [BZ 1113707] Allow sorting resourceName, scheduleName, timestamp and oobFactor on the server-side, rest on the client side only
    }

Just accept the non-HEAD segment.

(In reply to Jay Shaughnessy from comment #3)
> Just accept the non-HEAD segment.

done. cherry pick to release/jon3.2.x branch: 8e2d5ae9b993363e6ccf7ea4874515ae7a1fb1ec

Moving to ON_QA as this is available for test in JON 3.2.3 ER01 build:

http://jon01.mw.lab.eng.bos.redhat.com:8042/dist/release/jon/3.2.3.GA/8-14-14/