X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=8fad7d976652986490af226e20de46f9c30e9ccb;hb=87a5e53fb30e78b1ffd42b3d049d94d7d94400d6;hp=09565acf5338b39af00eb8c3c05cf86b22e3f092;hpb=c4d61cbf6b79b6dcf958aa03bf1c18b8f536d3cb;p=mkws-moved-to-github.git diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js index 09565ac..8fad7d9 100644 --- a/src/mkws-widget-main.js +++ b/src/mkws-widget-main.js @@ -19,15 +19,18 @@ mkws.registerWidgetType('targets', function() { var cleandata = []; for (var i = 0; i < data.length; i++) { var cur = {}; - cur.id = that.team.targetName(data[i].id); + cur.name = data[i].name; + cur.id = data[i].id; cur.hits = data[i].hits; cur.diagnostic = data[i].diagnostic; cur.message = data[i].message; cur.records = data[i].records; - cur.state = data[i].state; + cur.state = data[i].state.replace(/^Client_/, ''); cleandata.push(cur); } + cleandata.sort(function(a,b) { return a.name.localeCompare(b.name) }); + var template = that.team.loadTemplate(that.config.template || "targets"); that.node.html(template({data: cleandata})); }); @@ -256,7 +259,7 @@ mkws.registerWidgetType('ranking', function() { var cur = {}; var opt = this.config.sort_options[i]; cur.key = opt[0]; - cur.label = opt.length == 1 ? opt[0] : opt[1]; + cur.label = opt.length == 1 ? opt[0] : mkws.M(opt[1]); if (order == cur.key || order == cur.label) cur.selected = true; output.sort.push(cur); }