From 508bda37f56e3227ea54d9069e2eef2007c707b0 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Sep 2016 19:37:37 +0800
Subject: [PATCH] Modify form datetime valid error, because form format

---
 apps/templates/_nav.html              | 4 ++--
 apps/users/templates/users/_user.html | 4 +++-
 apps/users/views.py                   | 4 ----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index 25313a891..3efeb5649 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -9,8 +9,8 @@
         <i class="fa fa-group"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level active">
-        <li class="users"><a href="{% url 'users:user-list' %}">{% trans 'User' %}</a></li>
-        <li class="usergroups"><a href="{% url 'users:usergroup-list' %}">{% trans 'Usergroup' %}</a></li>
+        <li class="user"><a href="{% url 'users:user-list' %}">{% trans 'User' %}</a></li>
+        <li class="usergroup"><a href="{% url 'users:usergroup-list' %}">{% trans 'Usergroup' %}</a></li>
     </ul>
 </li>
 <li id="">
diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html
index 61f9ba729..b8acec82c 100644
--- a/apps/users/templates/users/_user.html
+++ b/apps/users/templates/users/_user.html
@@ -47,11 +47,12 @@
                                 <div class="col-sm-9">
                                     <div class="input-group date">
                                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control" value="{{ form.date_expired.value|date:'m/d/Y' }}">
+                                        <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control" value="{{ form.date_expired.value|date:'Y-m-d' }}">
                                     </div>
                                     <span class="help-block ">{{ form.date_expired.errors }}</span>
                                 </div>
                              </div>
+{#                            {{ form.date_expired|bootstrap_horizontal }}#}
                             <div class="form-group">
                                 <label for="{{ form.enable_otp.id_for_label }}" class="col-sm-2 control-label">{% trans 'Enable OTP' %}</label>
                                 <div class="col-sm-8">
@@ -84,6 +85,7 @@
             $('.select2').select2();
 
             $('.input-group.date').datepicker({
+                format: "yyyy-mm-dd",
                 todayBtn: "linked",
                 keyboardNavigation: false,
                 forceParse: false,
diff --git a/apps/users/views.py b/apps/users/views.py
index 304577736..5d61525d8 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -120,10 +120,6 @@ class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
         user_add_success_next(user)
         return super(UserAddView, self).form_valid(form)
 
-    def form_invalid(self, form):
-        print(form.errors)
-        return super(UserAddView, self).form_invalid(form)
-
     def get_success_message(self, cleaned_data):
         return self.success_message % (
             reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}),