Fix some bug

pull/530/head
ibuler 2016-08-28 23:58:22 +08:00
parent d95ffdfbf7
commit 3c9dbaf860
4 changed files with 21 additions and 16 deletions

View File

@ -109,7 +109,7 @@ else:
'NAME': CONFIG.DB_NAME, 'NAME': CONFIG.DB_NAME,
'HOST': CONFIG.DB_HOST, 'HOST': CONFIG.DB_HOST,
'PORT': CONFIG.DB_PORT, 'PORT': CONFIG.DB_PORT,
'USER': CONFIG.DB_USERNAME, 'USER': CONFIG.DB_USER,
'PASSWORD': CONFIG.DB_PASSWORD, 'PASSWORD': CONFIG.DB_PASSWORD,
} }
} }
@ -194,7 +194,7 @@ WS4REDIS_CONNECTION = {
'db': 2, 'db': 2,
} }
# Set the number of seconds each message shall persited # Set the number of seconds each message shall persisted
WS4REDIS_EXPIRE = 3600 WS4REDIS_EXPIRE = 3600
WS4REDIS_HEARTBEAT = 'love you' WS4REDIS_HEARTBEAT = 'love you'

View File

@ -10,7 +10,7 @@
<strong class="font-bold"> {{ request.user.name }}<span style="color: #8095a8"></span></strong> <strong class="font-bold"> {{ request.user.name }}<span style="color: #8095a8"></span></strong>
</span> </span>
<span class="text-muted text-xs block"> <span class="text-muted text-xs block">
{{ role | default:'普通用户' }}<b class="caret"></b> {{ request.user.get_role_display | default:'普通用户' }}<b class="caret"></b>
</span> </span>
</span> </span>
</a> </a>

View File

@ -1,2 +1,12 @@
# ~*~ coding: utf-8 ~*~ # ~*~ coding: utf-8 ~*~
# #
from django.contrib.auth.mixins import UserPassesTestMixin
from django.urls import reverse_lazy
class AdminUserRequiredMixin(UserPassesTestMixin):
login_url = reverse_lazy('users:login')
def test_func(self):
return self.request.user.is_staff

View File

@ -16,6 +16,7 @@ from django.contrib.auth import authenticate, login, logout
from .models import User, UserGroup from .models import User, UserGroup
from .forms import UserAddForm, UserUpdateForm, UserGroupForm, UserLoginForm from .forms import UserAddForm, UserUpdateForm, UserGroupForm, UserLoginForm
from .utils import AdminUserRequiredMixin
class UserLoginView(FormView): class UserLoginView(FormView):
@ -28,12 +29,6 @@ class UserLoginView(FormView):
return HttpResponseRedirect(reverse('users:user-list')) return HttpResponseRedirect(reverse('users:user-list'))
return super(UserLoginView, self).get(request, *args, **kwargs) return super(UserLoginView, self).get(request, *args, **kwargs)
def post(self, request, *args, **kwargs):
print(self.request.user)
print(request.POST)
print(request.session.session_key)
return HttpResponseRedirect('/')
def form_valid(self, form): def form_valid(self, form):
username = form.cleaned_data.get('username', '') username = form.cleaned_data.get('username', '')
password = form.cleaned_data.get('password', '') password = form.cleaned_data.get('password', '')
@ -50,7 +45,7 @@ class UserLoginView(FormView):
return super(UserLoginView, self).form_invalid(form) return super(UserLoginView, self).form_invalid(form)
class UserListView(ListView): class UserListView(AdminUserRequiredMixin, ListView):
model = User model = User
paginate_by = settings.CONFIG.DISPLAY_PER_PAGE paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
context_object_name = 'user_list' context_object_name = 'user_list'
@ -75,7 +70,7 @@ class UserListView(ListView):
return context return context
class UserAddView(SuccessMessageMixin, CreateView): class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
model = User model = User
form_class = UserAddForm form_class = UserAddForm
template_name = 'users/user_add.html' template_name = 'users/user_add.html'
@ -101,7 +96,7 @@ class UserAddView(SuccessMessageMixin, CreateView):
) )
class UserUpdateView(UpdateView): class UserUpdateView(AdminUserRequiredMixin, UpdateView):
model = User model = User
form_class = UserUpdateForm form_class = UserUpdateForm
template_name = 'users/user_edit.html' template_name = 'users/user_edit.html'
@ -128,13 +123,13 @@ class UserUpdateView(UpdateView):
return context return context
class UserDeleteView(DeleteView): class UserDeleteView(AdminUserRequiredMixin, DeleteView):
model = User model = User
success_url = reverse_lazy('users:user-list') success_url = reverse_lazy('users:user-list')
template_name = 'users/user_delete_confirm.html' template_name = 'users/user_delete_confirm.html'
class UserDetailView(DetailView): class UserDetailView(AdminUserRequiredMixin, DetailView):
model = User model = User
template_name = 'users/user_detail.html' template_name = 'users/user_detail.html'
context_object_name = "user" context_object_name = "user"
@ -146,7 +141,7 @@ class UserDetailView(DetailView):
return context return context
class UserGroupListView(ListView): class UserGroupListView(AdminUserRequiredMixin, ListView):
model = UserGroup model = UserGroup
paginate_by = settings.CONFIG.DISPLAY_PER_PAGE paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
context_object_name = 'usergroup_list' context_object_name = 'usergroup_list'
@ -170,7 +165,7 @@ class UserGroupListView(ListView):
return context return context
class UserGroupAddView(CreateView): class UserGroupAddView(AdminUserRequiredMixin, CreateView):
model = UserGroup model = UserGroup
form_class = UserGroupForm form_class = UserGroupForm
template_name = 'users/usergroup_add.html' template_name = 'users/usergroup_add.html'