diff --git a/jumpserver/context_processors.py b/jumpserver/context_processors.py index 3cae562ae..bab3bb5a3 100644 --- a/jumpserver/context_processors.py +++ b/jumpserver/context_processors.py @@ -1,5 +1,5 @@ def name_proc(request): user_id = request.session.get('user_id') - role = request.session.get('role') - return {'user_id': user_id, 'role': role} \ No newline at end of file + role = request.session.get('role_id') + return {'user_id': user_id, 'role_id': role} \ No newline at end of file diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 07f546db4..80c846fd9 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -111,4 +111,9 @@ def to_name(user_id): @register.filter(name='to_role_name') def to_role_name(role_id): role_dict = {'0': '普通用户', '1': '组管理员', '2': '超级管理员'} - return role_dict.get(role_id, '未知') \ No newline at end of file + return role_dict.get(str(role_id), '未知') + +@register.filter(name='to_avatar') +def to_avatar(role_id): + role_dict = {'0': 'user', '1': 'admin', '2': 'root'} + return role_dict.get(str(role_id), 'user') \ No newline at end of file diff --git a/jumpserver/views.py b/jumpserver/views.py index e8461c5ca..fe5363cb7 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -111,11 +111,11 @@ def login(request): if md5_crypt(password) == user.password: request.session['user_id'] = user.id if user.role == 'SU': - request.session['role'] = 2 + request.session['role_id'] = 2 elif user.role == 'GA': - request.session['role'] = 1 + request.session['role_id'] = 1 else: - request.session['role'] = 0 + request.session['role_id'] = 0 return HttpResponseRedirect('/') else: error = '密码错误,请重新输入。' diff --git a/juser/urls.py b/juser/urls.py index 0f35ece07..4d8151027 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -17,4 +17,6 @@ urlpatterns = patterns('juser.views', (r'^group_detail/$', 'group_detail'), (r'^group_del/$', 'group_del'), (r'^group_edit/$', 'group_edit'), + (r'^profile/$', 'profile'), + (r'^chg_pass/$', 'chg_pass'), ) diff --git a/juser/views.py b/juser/views.py index b15c2346a..ca84a206a 100644 --- a/juser/views.py +++ b/juser/views.py @@ -505,7 +505,18 @@ def user_add(request): return render_to_response('juser/user_add.html', locals(), context_instance=RequestContext(request)) - +def profile(request): + user_id = request.session.get('user_id') + if not user_id: + return HttpResponseRedirect('/') + user = User.objects.get(id=user_id) + return render_to_response('juser/user_detail.html', locals(), context_instance=RequestContext(request)) + + +def chg_pass(request): + header_title, path1, path2 = '修改信息 | Edit Info', '用户管理', '修改个人信息' + + return render_to_response('juser/user_add.html', locals(), context_instance=RequestContext(request)) diff --git a/templates/nav_li_profile.html b/templates/nav_li_profile.html index b9e9384c1..c8d714e64 100644 --- a/templates/nav_li_profile.html +++ b/templates/nav_li_profile.html @@ -1,17 +1,16 @@ {% load mytags %}