beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed routing errors

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/application.js
View file

@ -43,13 +43,13 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope'
$state.go('listForms'); // go to listForms page $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'){ 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 event.preventDefault(); // stop current execution
$state.go('home'); // go to listForms page $state.go('signup'); // go to listForms page
} }
}); });
} }

6
public/modules/core/controllers/header.client.controller.js
View file

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

16
public/modules/forms/config/forms.client.config.js
View file

@ -6,21 +6,11 @@ angular.module('forms').run(['Menus',
// Set top bar menu items // Set top bar menu items
Menus.addMenuItem('topbar', 'My Forms', 'forms', '', '/forms', false); Menus.addMenuItem('topbar', 'My Forms', 'forms', '', '/forms', false);
} }
]) ]).filter('formValidity',
/*.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',
function(){ function(){
return function(formObj){ return function(formObj){
if(formObj && formObj.form_fields && formObj.visible_form_fields){ if(formObj && formObj.form_fields && formObj.visible_form_fields){
//get keys //get keys
var formKeys = Object.keys(formObj); var formKeys = Object.keys(formObj);
@ -42,7 +32,7 @@ angular.module('forms').run(['Menus',
return 0; return 0;
}; };
}).config(['$provide', function ($provide){ }).config(['$provide', function ($provide){
$provide.decorator('accordionDirective', function($delegate) { $provide.decorator('accordionDirective', function($delegate) {
var directive = $delegate[0]; var directive = $delegate[0];
directive.replace = true; directive.replace = true;
return $delegate; return $delegate;

6
public/modules/forms/config/forms.client.routes.js
View file

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