github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 16:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ

Browse Source
This commit is contained in:
liuzheng712
2015-11-09 16:58:55 +08:00
parent cab346686d 91b5d039cc
commit 6db7642331
12 changed files with 373 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
juser/user_api.py
View File

@@ -5,7 +5,7 @@ from subprocess import call
from juser.models import AdminGroup
from jumpserver.api import *
from jumpserver.settings import BASE_DIR
from jumpserver.settings import BASE_DIR, EMAIL_HOST_USER as MAIL_FROM
def group_add_user(group, user_id=None, username=None):