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

fix url tab bug with configure tabs

Browse source
This commit is contained in:
David Baldwynn 2017-11-01 17:56:03 -07:00
parent 522dd85f89
commit eaea95078c
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/modules/forms/admin/controllers/admin-form.client.controller.js
View file

@ -64,12 +64,19 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$windo
];
$scope.go = function(tab){
$state.go(tab.route);
var currParentState = $state.current.name.split('.').slice(0,2).join('.');
var tabParentState = tab.route.split('.').slice(0,2).join('.');
if(currParentState !== tabParentState && tabParentState !== 'viewForm.configure.general'){
$state.go(tab.route);
}
};
function setActiveTab() {
$scope.tabData.forEach(function(tab) {
tab.active = ($state.current.name === tab.route);
var currentTabState = $state.current.name.split('.').slice(0,2).join('.');
var tabRouteState = tab.route.split('.').slice(0,2).join('.');
tab.active = (currentTabState === tabRouteState);
if(tab.active && tab.route === 'viewForm.design'){
$scope.designTabActive = true;

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

@ -6,6 +6,15 @@ angular.module('forms').run(['Menus',
// Set top bar menu items
Menus.addMenuItem('topbar', 'My Forms', 'forms', '', '/forms', false);
}
]).run(['$rootScope', '$state',
function($rootScope, $state) {
$rootScope.$on('$stateChangeStart', function(evt, to, params) {
if (to.redirectTo) {
evt.preventDefault();
$state.go(to.redirectTo, params)
}
});
}
]).filter('secondsToDateTime', [function() {
return function(seconds) {
return new Date(1970, 0, 1).setSeconds(seconds);