fixed routing errors

This commit is contained in:
David Baldwynn 2016-04-27 18:40:51 -07:00
parent 16d23fb4f2
commit e269fd8756
4 changed files with 13 additions and 23 deletions

View file

@ -43,13 +43,13 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope'
$state.go('listForms'); // go to listForms page
}
}
//Redirect to 'home' route if user is not authenticated
//Redirect to 'signup' route if user is not authenticated
else if(toState.name !== 'access_denied' && !Auth.isAuthenticated() && toState.name !== 'submitForm'){
console.log('go to home');
console.log('go to signup');
event.preventDefault(); // stop current execution
$state.go('home'); // go to listForms page
$state.go('signup'); // go to listForms page
}
});
}

View file

@ -17,8 +17,8 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
Auth.logout();
Auth.ensureHasCurrentUser(User);
$scope.user = $rootScope.user = null;
$state.go('home');
},
$state.go('listForms');
},
function(reason) {
console.log('Logout Failed: ' + reason);
});
@ -41,4 +41,4 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
});
}
]);
]);

View file

@ -6,21 +6,11 @@ angular.module('forms').run(['Menus',
// Set top bar menu items
Menus.addMenuItem('topbar', 'My Forms', 'forms', '', '/forms', false);
}
])
/*.filter('highlight', function() {
function escapeRegexp(queryToEscape) {
return ('' + queryToEscape).replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
}
return function(matchItem, query) {
return query && matchItem ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<span class="ui-select-highlight">$&</span>') : matchItem;
};
})*/
.filter('formValidity',
]).filter('formValidity',
function(){
return function(formObj){
if(formObj && formObj.form_fields && formObj.visible_form_fields){
//get keys
var formKeys = Object.keys(formObj);
@ -42,7 +32,7 @@ angular.module('forms').run(['Menus',
return 0;
};
}).config(['$provide', function ($provide){
$provide.decorator('accordionDirective', function($delegate) {
$provide.decorator('accordionDirective', function($delegate) {
var directive = $delegate[0];
directive.replace = true;
return $delegate;

View file

@ -15,13 +15,13 @@ angular.module('forms').config([
url: '/forms/:formId',
templateUrl: 'modules/forms/views/submit-form.client.view.html',
data: {
hideNav: true,
hideNav: true
},
resolve: {
Forms: 'Forms',
myForm: function (Forms, $stateParams) {
return Forms.get({formId: $stateParams.formId}).$promise;
},
}
},
controller: 'SubmitFormController',
controllerAs: 'ctrl'
@ -35,7 +35,7 @@ angular.module('forms').config([
Forms: 'Forms',
myForm: function (Forms, $stateParams) {
return Forms.get({formId: $stateParams.formId}).$promise;
},
}
},
controller: 'AdminFormController'
}).state('viewForm.configure', {