tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 23:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename attached rulelist when renaming a profile. Fix #40.

Browse Source
This commit is contained in:
FelisCatus 2014-10-10 13:03:35 +08:00
parent 817528ef21
commit 546f6ab6e4
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
omega-web/src/omega/app.coffee
View File

@ -24,8 +24,9 @@ angular.module('omega').config ($stateProvider, $urlRouterProvider,
$animateProvider.classNameFilter(/angular-animate/) $animateProvider.classNameFilter(/angular-animate/)
$urlRouterProvider.otherwise '/ui' $urlRouterProvider.otherwise '/ui'
$urlRouterProvider.otherwise ($injector, $location) -> $urlRouterProvider.otherwise ($injector, $location) ->
if $location.path() == '' or $location.path() == '/' if $location.path() == ''
$injector.get('omegaTarget').lastUrl() $injector.get('omegaTarget').lastUrl()
else else
'/ui' '/ui'

25
omega-web/src/omega/controllers/master.coffee
View File

@ -1,6 +1,6 @@
angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window, angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
$modal, $state, builtinProfiles, profileColors, profileIcons, omegaTarget, $q, $modal, $state, builtinProfiles, profileColors, profileIcons, omegaTarget, $q,
$timeout, $location, $filter) -> $timeout, $location, $filter, getAttachedName) ->
tr = $filter('tr') tr = $filter('tr')
@ -136,7 +136,28 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
scope: scope scope: scope
).result.then (toName) -> ).result.then (toName) ->
if toName != fromName if toName != fromName
omegaTarget.renameProfile(fromName, toName).then(-> rename = omegaTarget.renameProfile(fromName, toName)
attachedName = getAttachedName(fromName)
if $rootScope.profileByName(attachedName)
toAttachedName = getAttachedName(toName)
defaultProfileName = undefined
if $rootScope.profileByName(toAttachedName)
defaultProfileName = profile.defaultProfileName
rename = rename.then ->
toAttachedKey = OmegaPac.Profiles.nameAsKey(toAttachedName)
profile = $rootScope.profileByName(toName)
profile.defaultProfileName = 'direct'
OmegaPac.Profiles.updateRevision(profile)
delete $rootScope.options[toAttachedKey]
$rootScope.applyOptions()
rename = rename.then ->
omegaTarget.renameProfile(attachedName, toAttachedName)
if defaultProfileName
rename = rename.then ->
profile = $rootScope.profileByName(toName)
profile.defaultProfileName = defaultProfileName
$rootScope.applyOptions()
rename.then(->
$state.go('profile', {name: toName}) $state.go('profile', {name: toName})
).catch (err) -> ).catch (err) ->
$rootScope.showAlert( $rootScope.showAlert(