GUI -- Device View still had hardcoded sort params - fixed.
- Minor other cleanup of variable names.

Change-Id: I17b40fa087e653fecb49ded4feb7ff1932fb52e9
diff --git a/web/gui/src/main/webapp/app/view/device/device.js b/web/gui/src/main/webapp/app/view/device/device.js
index 13601de..d7b3292 100644
--- a/web/gui/src/main/webapp/app/view/device/device.js
+++ b/web/gui/src/main/webapp/app/view/device/device.js
@@ -34,13 +34,8 @@
                 $scope.$apply();
             };
 
-            $scope.sortCallback = function (urlSuffix) {
-                // FIXME: fix hardcoded sort params
-                if (!urlSuffix) {
-                    urlSuffix = '';
-                }
-                var payload = { sortCol: 'id', sortDir: 'asc' };
-                wss.sendEvent('deviceDataRequest', payload);
+            $scope.sortCallback = function (requestParams) {
+                wss.sendEvent('deviceDataRequest', requestParams);
             };
 
             var handlers = {
@@ -53,9 +48,8 @@
                 wss.unbindHandlers(handlers);
             });
 
-            $log.log('OvDeviceCtrl has been created');
-
             $scope.sortCallback();
 
+            $log.log('OvDeviceCtrl has been created');
         }]);
 }());