From c27efc4c1c282114c3399228be5dc5c9d02a4d17 Mon Sep 17 00:00:00 2001
From: Shaoquan Chen <sean.chen2@hp.com>
Date: Mon, 16 Mar 2015 17:07:51 -0700
Subject: [PATCH] [Launch Instance Fix] Add Sorting To Table in Select Source

Change-Id: I8fd351d412750fc472d9821d8c835a96856e31ad
Closes-Bug: 1432880
---
 .../launch-instance/source/source.html        | 24 ++++++++++++-------
 .../launch-instance/source/source.js          | 20 ++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/openstack_dashboard/static/dashboard/launch-instance/source/source.html b/openstack_dashboard/static/dashboard/launch-instance/source/source.html
index 35c5133600..bf25adb39d 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/source/source.html
+++ b/openstack_dashboard/static/dashboard/launch-instance/source/source.html
@@ -234,20 +234,28 @@
             </tr>
             <tr>
               <th class="expander"></th>
-              <th ng-class="tableHeadCells[0].classList"
-                  ng-style="tableHeadCells[0].style">
+              <th ng-attr-st-sort-default="{$ tableHeadCells[0].sortDefault $}"
+                  ng-class="tableHeadCells[0].classList"
+                  ng-style="tableHeadCells[0].style"
+                  st-sort="{$ tableHeadCells[0].sortable && tableBodyCells[0].key $}">
                 {$ tableHeadCells[0].text $}
               </th>
-              <th ng-class="tableHeadCells[1].classList"
-                  ng-style="tableHeadCells[1].style">
+              <th ng-attr-st-sort-default="{$ tableHeadCells[1].sortDefault $}"
+                  ng-class="tableHeadCells[1].classList"
+                  ng-style="tableHeadCells[1].style"
+                  st-sort="{$ tableHeadCells[1].sortable && tableBodyCells[1].key $}">
                 {$ tableHeadCells[1].text $}
               </th>
-              <th ng-class="tableHeadCells[2].classList"
-                  ng-style="tableHeadCells[2].style">
+              <th ng-attr-st-sort-default="{$ tableHeadCells[2].sortDefault $}"
+                  ng-class="tableHeadCells[2].classList"
+                  ng-style="tableHeadCells[2].style"
+                  st-sort="{$ tableHeadCells[2].sortable && tableBodyCells[2].key $}">
                 {$ tableHeadCells[2].text $}
               </th>
-              <th ng-class="tableHeadCells[3].classList"
-                  ng-style="tableHeadCells[3].style">
+              <th ng-attr-st-sort-default="{$ tableHeadCells[3].sortDefault $}"
+                  ng-class="tableHeadCells[3].classList"
+                  ng-style="tableHeadCells[3].style"
+                  st-sort="{$ tableHeadCells[3].sortable && tableBodyCells[3].key $}">
                 {$ tableHeadCells[3].text $}
               </th>
               <th class="action"></th>
diff --git a/openstack_dashboard/static/dashboard/launch-instance/source/source.js b/openstack_dashboard/static/dashboard/launch-instance/source/source.js
index 3b036c30df..2033fbf41d 100644
--- a/openstack_dashboard/static/dashboard/launch-instance/source/source.js
+++ b/openstack_dashboard/static/dashboard/launch-instance/source/source.js
@@ -91,25 +91,25 @@
 
     var tableHeadCellsMap = {
       image: [
-        { text: gettext('Name'), style: { width: '25%' } },
-        { text: gettext('Updated'), style: { width: '20%' } },
-        { text: gettext('Size'), style: { width: '15%' }, classList: ['number'] },
-        { text: gettext('Type') }
+        { text: gettext('Name'), style: { width: '25%' }, sortable: true, sortDefault: true },
+        { text: gettext('Updated'), style: { width: '20%' }, sortable: true },
+        { text: gettext('Size'), style: { width: '15%' }, classList: ['number'], sortable: true },
+        { text: gettext('Type'), sortable: true }
       ],
       volume: [
-        { text: gettext('Name'), style: { width: '25%' } },
+        { text: gettext('Name'), style: { width: '25%' }, sortable: true, sortDefault: true },
         { text: gettext('Type'), style: { width: '20%' } },
-        { text: gettext('Size'), classList: ['number'] }
+        { text: gettext('Size'), classList: ['number'], sortable: true }
       ],
       snapshot: [
-        { text: gettext('Name'), style: { width: '25%' } },
+        { text: gettext('Name'), style: { width: '25%' }, sortable: true, sortDefault: true },
         { text: gettext('Type'), style: { width: '20%' } },
-        { text: gettext('Size'), classList: ['number'] }
+        { text: gettext('Size'), classList: ['number'], sortable: true }
       ],
       volume_snapshot: [
-        { text: gettext('Name'), style: { width: '25%' } },
+        { text: gettext('Name'), style: { width: '25%' }, sortable: true, sortDefault: true },
         { text: gettext('Type'), style: { width: '20%' } },
-        { text: gettext('Size'), classList: ['number'] }
+        { text: gettext('Size'), classList: ['number'], sortable: true }
       ]
     };