Merge pull request #594 from maciaszczykm/sorting-fix

Fix table sorting
kubernetes · Mar 30, 2016 · 5b31f2f · 5b31f2f
2 parents 8dcf5a3 + 72321ac
commit 5b31f2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html b/src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail.html
@@ -60,7 +60,7 @@ <h1 flex="auto" class="md-title kd-replicationcontrollerdetail-app-name">
               </th>
               <th class="kd-replicationcontrollerdetail-table-header">
                 <kd-sorted-header currently-selected-column="ctrl.sortPodsBy"
-                                  currently-selected-order="ctrl.podsOrder" column-name="status"
+                                  currently-selected-order="ctrl.podsOrder" column-name="podPhase"
                                   tooltip="Status of the pod">
                   Status
                 </kd-sorted-header>
@@ -219,7 +219,7 @@ <h1 flex="auto" class="md-title kd-replicationcontrollerdetail-app-name">
             <th class="kd-replicationcontrollerdetail-table-header">
               <kd-sorted-header currently-selected-column="ctrl.sortEventsBy"
                                 currently-selected-order="ctrl.eventsOrder"
-                                column-name="['sourceComponent','sourceHost']"
+                                column-name="[sourceComponent,sourceHost]"
                                 tooltip="Source of the event, details of component and host">
                 Source
               </kd-sorted-header>

diff --git a/src/app/frontend/replicationcontrollerdetail/sortedheader_controller.js b/src/app/frontend/replicationcontrollerdetail/sortedheader_controller.js
@@ -40,7 +40,8 @@ export default class SortedHeaderController {
     this.tooltip;
 
     /**
-     * Name of current header column. Initialized from the scope (read-only).
+     * Name of current header column. Must match at least one of sorted object members. Initialized
+     * from the scope (read-only).
      * @export {string}
      */
     this.columnName;