From 2d45735ec211868cf5aa1f7435548895c64c032b Mon Sep 17 00:00:00 2001 From: jysperm Date: Tue, 18 Nov 2014 07:17:35 +0800 Subject: [PATCH] fixbugs --- core/test/router/panel.test.coffee | 3 +-- core/view/panel/financials.jade | 2 +- plugin/linux/index.coffee | 3 ++- plugin/linux/linux.coffee | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/test/router/panel.test.coffee b/core/test/router/panel.test.coffee index ce75f98..37f8903 100644 --- a/core/test/router/panel.test.coffee +++ b/core/test/router/panel.test.coffee @@ -10,7 +10,6 @@ describe 'router/panel', -> .end done it 'GET pay', (done) -> - @timeout 20000 - agent.get '/panel/pay' + agent.get '/panel/financials' .expect 200 .end done diff --git a/core/view/panel/financials.jade b/core/view/panel/financials.jade index e941509..e908da3 100644 --- a/core/view/panel/financials.jade +++ b/core/view/panel/financials.jade @@ -1,7 +1,7 @@ extends ../layout prepend header - title #{t('common.charge')} | #{t(config.web.t_name)} + title #{t('common.financials')} | #{t(config.web.t_name)} block main .row diff --git a/plugin/linux/index.coffee b/plugin/linux/index.coffee index c0e3c94..b12702a 100644 --- a/plugin/linux/index.coffee +++ b/plugin/linux/index.coffee @@ -46,7 +46,8 @@ exports.registerHook 'account.resources_limit_changed', exports.registerServiceHook 'enable', filter: (req, callback) -> - linux.createUser req.account, callback + linux.deleteUser req.account, -> + linux.createUser req.account, callback exports.registerServiceHook 'disable', filter: (req, callback) -> diff --git a/plugin/linux/linux.coffee b/plugin/linux/linux.coffee index c64c84a..dc024fe 100644 --- a/plugin/linux/linux.coffee +++ b/plugin/linux/linux.coffee @@ -27,10 +27,10 @@ exports.deleteUser = (account, callback) -> callback() (callback) -> - child_process.exec "sudo groupdel #{account.username}", callback + child_process.exec "sudo groupdel #{account.username}", -> + callback() - ], (err) -> - logger.error err if err + ], -> cache.delete 'linux.getPasswdMap', callback exports.setResourceLimit = (account, callback) ->