diff --git a/src/js/services/qmService.js b/src/js/services/qmService.js index af7d057f4c..0900ca6c83 100644 --- a/src/js/services/qmService.js +++ b/src/js/services/qmService.js @@ -1797,7 +1797,8 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i return false; } if(!measurement.variableCategoryName){ - measurement.variableCategoryName = qm.urlHelper.getParam('variableCategoryName'); + measurement.variableCategoryName = + qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl(); } if(!measurement.variableCategoryName){ message = 'Please select a variable category'; @@ -3884,18 +3885,6 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i successHandler, errorHandler); }; - qmService.getVariableCategoryNameFromStateParamsOrUrl = function($stateParams){ - var variableCategoryName; - if($stateParams && $stateParams.variableCategoryName){ - variableCategoryName = $stateParams.variableCategoryName; - }else if(qm.urlHelper.getParam('variableCategoryName')){ - variableCategoryName = qm.urlHelper.getParam('variableCategoryName'); - } - if(variableCategoryName && variableCategoryName !== "Anything"){ - return variableCategoryName; - } - return null; - }; qmService.goToState = function(to, params, options){ if(params && params.variableObject && !params.variableName){params.variableName = params.variableObject.name;} //qmLog.info('Called goToState: ' + to, null, qmLog.getStackTrace());