Skip to content

J
jumpserver
Commit 05603327 authored by halcyon's avatar halcyon
Browse files
Options

change view

parent 795183c7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
jumpserver/views.py
View file @ 05603327
...@@ -23,7 +23,6 @@ def skin_config(request): ...@@ -23,7 +23,6 @@ def skin_config(request):
return render_to_response('skin_config.html') return render_to_response('skin_config.html')
<<<<<<< HEAD
def jasset_group_add(name, comment, type): def jasset_group_add(name, comment, type):
if BisGroup.objects.filter(name=name): if BisGroup.objects.filter(name=name):
emg = u'该业务组已存在!' emg = u'该业务组已存在!'
...@@ -64,7 +63,7 @@ def jasset_host_edit(j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment): ...@@ -64,7 +63,7 @@ def jasset_host_edit(j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment):
a.save() a.save()
a.bis_group = groups a.bis_group = groups
a.save() a.save()
=======
def login(request): def login(request):
"""登录界面""" """登录界面"""
if request.session.get('username'): if request.session.get('username'):
...@@ -96,6 +95,3 @@ def login(request): ...@@ -96,6 +95,3 @@ def login(request):
def logout(request): def logout(request):
request.session.delete() request.session.delete()
return HttpResponseRedirect('/login/') return HttpResponseRedirect('/login/')
>>>>>>> guanghongwei
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment