From f24b34758cb99abb040199496cb92e4a4682234c Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Tue, 23 Feb 2016 21:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsudo=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E3=80=80=E5=B0=8F=E5=86=99all=20=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jperm/views.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jperm/views.py b/jperm/views.py index a8a66128b..2f3e07762 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -619,7 +619,12 @@ def perm_sudo_add(request): raise ServerError(u"sudo name 和 commands是必填项!") pattern = re.compile(r'[\n,\r]') - commands = ', '.join(list_drop_str(pattern.split(commands), u'')) + deal_commands = list_drop_str(pattern.split(commands), u'') + for command in deal_commands: + if command.lower() == "all": + deal_commands.remove(command) + deal_commands.append(command.upper()) + commands = ', '.join(deal_commands) logger.debug(u'添加sudo %s: %s' % (name, commands)) if get_object(PermSudo, name=name): @@ -656,7 +661,12 @@ def perm_sudo_edit(request): raise ServerError(u"sudo name 和 commands是必填项!") pattern = re.compile(r'[\n,\r]') - commands = ', '.join(list_drop_str(pattern.split(commands), u'')).strip() + deal_commands = list_drop_str(pattern.split(commands), u'') + for command in deal_commands: + if command.lower() == "all": + deal_commands.remove(command) + deal_commands.append(command.upper()) + commands = ', '.join(deal_commands).strip() logger.debug(u'添加sudo %s: %s' % (name, commands)) sudo.name = name.strip()