branch develop updated (e91b089 -> cda9e55)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from e91b089 fixes #7853 add users searched export on ui new cda9e55 fix simple search <-> advanced search change in ui The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cda9e55631b3be0dcf1dd60910c96a24307be75b Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 23 14:12:03 2015 +0100 fix simple search <-> advanced search change in ui Summary of changes: coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit cda9e55631b3be0dcf1dd60910c96a24307be75b Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 23 14:12:03 2015 +0100 fix simple search <-> advanced search change in ui --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index e1afab7..39c6537 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -181,6 +181,13 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara $scope.search.searchKeywords.push(keywords); } + var advancedSearch = $routeParams.advancedSearch; + if (advancedSearch) { + $scope.advanced = advancedSearch; + } else { + $scope.advanced = false; + } + documentService.getDocuments($scope.search.searchKeywords, function(documents) { $scope.documents = documents; }, errorService.defaultFailOnCall); @@ -563,6 +570,13 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', $scope.search.showDisable = false; } + var advancedSearch = $routeParams.advancedSearch; + if (advancedSearch) { + $scope.advanced = advancedSearch; + } else { + $scope.advanced = false; + } + userService.getUsers($scope.search.searchKeywords, $scope.search.showDisable, function(users) { $scope.users = users; }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm