Changed order in datatables (#286)

* Changed order in image datatable * Changed order in virtual routers datatable * Changed order virtual routers templates datatable * Changed order datastores datatable * Changed order marketplaceapps datatable * Changed order marketplaces datatable * Changed order oneflow-services datatable * Changed order oneflow-templates datatable * Changed order secgroups datatable * Changed order vms datatable * Changed order vnets datatable
2025-02-28 17:57:22 +03:00 · 2017-05-04 19:48:24 +02:00 · 2017-05-04 19:48:24 +02:00 · c292f2aa8d
commit c292f2aa8d
parent d7fb901b42
11 changed files with 31 additions and 31 deletions
--- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js
@ -79,9 +79,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
-      Locale.tr("Owner"),
-      Locale.tr("Group"),
      Locale.tr("Name"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),      
      Locale.tr("Capacity"),
      Locale.tr("Cluster"),
      Locale.tr("Basepath"),
@ -143,9 +143,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        DatastoreCapacityBar.html(element),
        clusters,
        element.BASE_PATH,
--- a/src/sunstone/public/app/tabs/images-tab/datatable-common.js
+++ b/src/sunstone/public/app/tabs/images-tab/datatable-common.js
@ -63,9 +63,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Datastore"),
      Locale.tr("Size"),
      Locale.tr("Type"),
@ -116,9 +116,9 @@ define(function(require) {
                           element.ID + '" name="selected_items" value="' +
                           element.ID + '"/>',
      element.ID,
-      element.UNAME,
-      element.GNAME,
      element.NAME,
+      element.UNAME,
+      element.GNAME,   
      element.DATASTORE,
      Humanize.sizeFromMB(element.SIZE),
      type,
--- a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
@ -81,9 +81,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Version"),
      Locale.tr("Size"),
      Locale.tr("State"),
@ -143,9 +143,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        element.VERSION,
        Humanize.sizeFromMB(element.SIZE),
        state,
--- a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
@ -80,9 +80,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Capacity"),
      Locale.tr("Apps"),
      Locale.tr("Driver"),
@ -135,9 +135,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        DatastoreCapacityBar.html(element),
        _lengthOf(element.MARKETPLACEAPPS.ID),
        element.MARKET_MAD,
--- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
@ -62,10 +62,10 @@ define(function(require) {
    };

    this.columns = [
-      Locale.tr("ID") ,
-      Locale.tr("Owner") ,
-      Locale.tr("Group"),
+      Locale.tr("ID"),
      Locale.tr("Name"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
      Locale.tr("State"),
      Locale.tr("Labels"),
      "search_data"
--- a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
@ -61,10 +61,10 @@ define(function(require) {
    };

    this.columns = [
-      Locale.tr("ID") ,
-      Locale.tr("Owner") ,
-      Locale.tr("Group"),
+      Locale.tr("ID"),
      Locale.tr("Name"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
      Locale.tr("Labels"),
      "search_data"
    ];
@ -108,9 +108,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
        btoa(unescape(encodeURIComponent(JSON.stringify(search))))
    ];
--- a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js
@ -62,9 +62,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Labels"),
      "search_data"
    ];
@ -108,9 +108,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
        btoa(unescape(encodeURIComponent(JSON.stringify(search))))
    ];
--- a/src/sunstone/public/app/tabs/templates-tab/datatable-common.js
+++ b/src/sunstone/public/app/tabs/templates-tab/datatable-common.js
@ -63,10 +63,10 @@ define(function(require) {
    }

    this.columns = [
-      Locale.tr("ID") ,
-      Locale.tr("Owner") ,
-      Locale.tr("Group"),
+      Locale.tr("ID"),
      Locale.tr("Name"),
+      Locale.tr("Owner"),
+      Locale.tr("Group"),
      Locale.tr("Registration time"),
      Locale.tr("Labels"),
      "search_data"
@ -115,9 +115,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        Humanize.prettyTime(element.REGTIME),
        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
        btoa(unescape(encodeURIComponent(JSON.stringify(search))))
--- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
+++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js
@ -27,10 +27,10 @@ define(function(require) {
  var TEMPLATE_ATTR = 'USER_TEMPLATE';

  var _columns = [
-    Locale.tr("ID") ,
-    Locale.tr("Owner") ,
-    Locale.tr("Group"),
+    Locale.tr("ID"),
    Locale.tr("Name"),
+    Locale.tr("Owner"),
+    Locale.tr("Group"),
    Locale.tr("Status"),
    Locale.tr("Used CPU"),
    Locale.tr("Used Memory"),
@ -117,9 +117,9 @@ define(function(require) {
        'value="' + element.ID + '" '+
        'state="'+element.STATE+'" lcm_state="'+element.LCM_STATE+'"/>',
      element.ID,
+      element.NAME,
      element.UNAME,
      element.GNAME,
-      element.NAME,
      state,
      cpuMonitoring,
      Humanize.size(memoryMonitoring),
--- a/src/sunstone/public/app/tabs/vnets-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/vnets-tab/datatable.js
@ -65,9 +65,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Reservation"),
      Locale.tr("Cluster"),
      Locale.tr("Bridge"),
@ -146,9 +146,9 @@ define(function(require) {
                           element.ID + '" name="selected_items" value="' +
                           element.ID + '"/>',
      element.ID,
+      element.NAME,
      element.UNAME,
      element.GNAME,
-      element.NAME,
      element.PARENT_NETWORK_ID.length ? Locale.tr("Yes") : Locale.tr("No"),
      clusters,
      element.BRIDGE,
--- a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js
@ -62,9 +62,9 @@ define(function(require) {

    this.columns = [
      Locale.tr("ID"),
+      Locale.tr("Name"),
      Locale.tr("Owner"),
      Locale.tr("Group"),
-      Locale.tr("Name"),
      Locale.tr("Labels"),
      "search_data"
    ];
@ -108,9 +108,9 @@ define(function(require) {
                             element.ID + '" name="selected_items" value="' +
                             element.ID + '"/>',
        element.ID,
+        element.NAME,
        element.UNAME,
        element.GNAME,
-        element.NAME,
        (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
        btoa(unescape(encodeURIComponent(JSON.stringify(search))))
    ];