remove setting in admin and change gender to sex in admin

Author: caitinggui

apps/admin/templates/admin/base.html

@@ -182,9 +182,6 @@
                     <li {% if request.path == '/admin/link/' %}class="active"{% endif %}><a href="{% url 'admin:link' %}"><i class="fa fa-circle-o text-aqua"></i> <span>友情链接</span></a></li>
                 {% endif %}
                 <li {% if request.path == '/admin/profile/' %}class="active"{% endif %}><a href="{% url 'admin:profile' %}"><i class="fa fa-circle-o text-red"></i> <span>个人信息</span></a></li>
-                {% if request.user.is_superuser %}
-                    <li {% if request.path == '/admin/setting/' %}class="active"{% endif %}><a href="{% url 'admin:setting' %}"><i class="fa fa-circle-o text-yellow"></i> <span>全局设置</span></a></li>
-                {% endif %}
             </ul>
         </section>
         <!-- /.sidebar -->

apps/admin/templates/admin/profile.html

@@ -36,7 +36,7 @@ <h3 class="box-title">个人信息</h3>
                                     <label for="inputNikName" class="col-sm-2 control-label">昵称</label>
 
                                     <div class="col-sm-10">
-                                        <input type="text" class="form-control" id="inputNikName" placeholder="Nick Name" value="{{ request.user.nickname }}" name="nickname">
+                                        <input type="text" class="form-control" id="inputNikName" placeholder="Nick Name" value="{{ user.nickname }}" name="nickname">
                                     </div>
                                 </div>
 
@@ -45,10 +45,10 @@ <h3 class="box-title">个人信息</h3>
                                     <div class="col-sm-10">
                                         <div class="radio">
                                             <label>
-                                                <input type="radio" name="gender" id="optionsRadios1" value="male" {% if request.user.gender == 'male' %} checked{% endif %} >男
+                                                <input type="radio" name="sex" id="optionsRadios1" value="male" {% if user.sex == 'male' %} checked{% endif %} >男
                                             </label>
                                             <label>
-                                                <input type="radio" name="gender" id="optionsRadios2" value="female" {% if request.user.gender == 'female' %} checked{% endif %}>女
+                                                <input type="radio" name="sex" id="optionsRadios2" value="female" {% if user.sex == 'female' %} checked{% endif %}>女
                                             </label>
                                         </div>
                                     </div>

apps/admin/urls.py

@@ -7,7 +7,6 @@
     url(r'^link/$', LinkView.as_view(), name='link'),
     url(r'^users/$', UsersView.as_view(), name='users'),
     url(r'^profile/$', ProfileView.as_view(), name='profile'),
-    url(r'^setting/$', SettingView.as_view(), name='setting'),
     url(r'^visitor/$', VisitorListView.as_view(), name='visitor'),
     url(r'^upload/$', csrf_exempt(UploadView.as_view()), name='upload'),
     url(r'^categories/$', CategoryView.as_view(), name='categories'),

apps/admin/views.py

@@ -11,7 +11,7 @@
 from django.utils import timezone
 from django.conf import settings
 
-from .forms import LinkForm, SettingForm
+from .forms import LinkForm
 from blog.models import Article, BlogComment, Category, Permission,\
         Link, Tag, UserProfile, UserProfile, VisitorIP
 from .models import *
@@ -33,7 +33,6 @@
     'DashboardView',
     'MessageOSView',
     'MessageCommentView',
-    'SettingView',
     "VisitorListView",
     "VisitorBodyView"
 ]
@@ -295,16 +294,17 @@ def get_queryset(self):
 
 class ProfileView(LoginRequiredMixin, View):
     def get(self, request):
-        return render(request, 'admin/profile.html')
+        user_profile, create_flag = UserProfile.objects.get_or_create(user_id=request.user.pk)
+        return render(request, 'admin/profile.html', {"user": user_profile})
 
     def post(self, request):
         nickname = request.POST.get('nickname')
-        gender = request.POST.get('gender')
+        sex = request.POST.get('sex')
         user_profile, create_flag = UserProfile.objects.get_or_create(user_id=request.user.pk)
         if nickname:
             user_profile.nickname = nickname
-        if gender:
-            user_profile.gender = gender
+        if sex:
+            user_profile.sex = sex
         user_profile.save()
         return HttpResponseRedirect(reverse('admin:profile'))
 
@@ -336,38 +336,3 @@ def get(self, request):
         BlogComment.objects.filter(status=False).update(status=True)
         comments = BlogComment.objects.all().order_by('-add_time')
         return render(request, 'admin/message-comment.html', {'comments': comments})
-
-
-class SettingView(View):
-    def get(self, request):
-        try:
-            setting = Setting.objects.get(pk=1)
-        except Setting.DoesNotExist:
-            setting = None
-        return render(request, 'admin/setting.html', {'setting': setting})
-
-    def post(self, request):
-        setting_form = SettingForm(request.POST)
-        if setting_form.is_valid():
-            title = request.POST.get('title')
-            keywords = request.POST.get('keywords')
-            description = request.POST.get('description')
-            nickname = request.POST.get('nickname')
-            avatar = request.FILES.get('avatar')
-            homedescription = request.POST.get('homedescription')
-            recordinfo = request.POST.get('recordinfo')
-            statisticalcode = request.POST.get('statisticalcode')
-            setting, flag = Setting.objects.get_or_create(pk=1)
-            setting.title = title
-            setting.keywords = keywords
-            setting.description = description
-            setting.nickname = nickname
-            if avatar:
-                setting.avatar = avatar
-            setting.homedescription = homedescription
-            setting.recordinfo = recordinfo
-            setting.statisticalcode = statisticalcode
-            setting.save()
-            return HttpResponseRedirect(reverse('admin:setting'))
-        else:
-            return HttpResponse(setting_form.errors)