From ea014bd9dff3f14102e505d7b8f4af3938720495 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 12 Dec 2014 15:21:44 -0800 Subject: [PATCH] no column title or sort button for delete and backend_status columns --- .../core/xoslib/static/js/xoslib/xosHelper.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js index d450ea9..ece2419 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js +++ b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js @@ -750,7 +750,13 @@ XOSDataTableView = Marionette.View.extend( { _.each(this.collection.listFields, function(fieldName) { mRender = undefined; mSearchText = undefined; - if (fieldName in view.collection.foreignFields) { + sTitle = fieldNameToHumanReadable(fieldName); + bSortable = true; + if (fieldName=="backend_status") { + mRender = function(x,y,z) { return xosBackendStatusIconTemplate(z); }; + sTitle = ""; + bSortable = false; + } else if (fieldName in view.collection.foreignFields) { var foreignCollection = view.collection.foreignFields[fieldName]; mSearchText = function(x) { return idToName(x, foreignCollection, "humanReadableName"); }; } @@ -758,15 +764,12 @@ XOSDataTableView = Marionette.View.extend( { var collectionName = view.collection.collectionName; mRender = function(x,y,z) { return '' + x + ''; }; } - if (fieldName=="backend_status") { - mRender = function(x,y,z) { return xosBackendStatusIconTemplate(z); }; - } - thisColumn = {sTitle: fieldNameToHumanReadable(fieldName), mData: fieldName, mRender: mRender, mSearchText: mSearchText}; + thisColumn = {sTitle: sTitle, bSortable: bSortable, mData: fieldName, mRender: mRender, mSearchText: mSearchText}; view.columnsByIndex.push( thisColumn ); view.columnsByFieldName[fieldName] = thisColumn; }); - deleteColumn = {sTitle: "delete", mRender: function(x,y,z) { return xosDeleteButtonTemplate({modelName: view.collection.modelName, id: z.id}); }, mData: function() { return "delete"; }}; + deleteColumn = {sTitle: "", bSortable: false, mRender: function(x,y,z) { return xosDeleteButtonTemplate({modelName: view.collection.modelName, id: z.id}); }, mData: function() { return "delete"; }}; view.columnsByIndex.push(deleteColumn); view.columnsByFieldName["delete"] = deleteColumn; -- 2.43.0