zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 16:32:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

removing $urlMatcherFactory and $urlRouter b/c they're deprecated

Browse Source 
in favor or $urlService
This commit is contained in:
Jared Tabor
2017-10-16 15:46:40 -07:00
parent 3d5f301a07
commit 4f0fa57a1b
31 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -122,7 +122,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
// but will register new $stateParams[$scope.iterator + '_search'] terms
if(!$scope.querySet) {
$state.go('.', {
[$scope.iterator + '_search']: queryset }, {reload:true});
[$scope.iterator + '_search']: queryset });
}
qs.search(path, queryset).then((res) => {
if($scope.querySet) {
@@ -246,7 +246,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
}
});
queryset = _.merge(queryset, params, (objectValue, sourceValue, key, object) => {
queryset = _.merge({}, queryset, params, (objectValue, sourceValue, key, object) => {
if (object[key] && object[key] !== sourceValue){
if(_.isArray(object[key])) {
// Add the new value to the array and return
@@ -287,8 +287,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
// This transition will not reload controllers/resolves/views
// but will register new $stateParams[$scope.iterator + '_search'] terms
if(!$scope.querySet) {
$state.go('.', {
[$scope.iterator + '_search']: queryset }, { reload:true }).then(function(){
$state.go('.', {[$scope.iterator + '_search']:queryset }).then(function(){
// ISSUE: same as above in $scope.remove. For some reason deleting the page
// from the queryset works for all lists except lists in modals.
delete $stateParams[$scope.iterator + '_search'].page;
@@ -379,7 +378,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
removeFromQuerySet(queryset);
if(!$scope.querySet) {
$state.go('.', {
[$scope.iterator + '_search']: queryset }, {reload:true}).then(function(){
[$scope.iterator + '_search']: queryset }).then(function(){
// ISSUE: for some reason deleting a tag from a list in a modal does not
// remove the param from $stateParams. Here we'll manually check to make sure
// that that happened and remove it if it didn't.
@@ -403,7 +402,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
delete cleared.page;
queryset = cleared;
if(!$scope.querySet) {
$state.go('.', {[$scope.iterator + '_search']: queryset}, {reload:true});
$state.go('.', {[$scope.iterator + '_search']: queryset});
}
qs.search(path, queryset).then((res) => {
if($scope.querySet) {