github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Modify form datetime valid error, because form format

pull/530/head
ibuler 2016-09-05 19:37:37 +08:00
parent a0ef3cfc34
commit 508bda37f5
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/templates/_nav.html
View File

@ -9,8 +9,8 @@
<i class="fa fa-group"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span> <i class="fa fa-group"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span>
</a> </a>
<ul class="nav nav-second-level active"> <ul class="nav nav-second-level active">
<li class="users"><a href="{% url 'users:user-list' %}">{% trans 'User' %}</a></li> <li class="user"><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="usergroup"><a href="{% url 'users:usergroup-list' %}">{% trans 'Usergroup' %}</a></li>
</ul> </ul>
</li> </li>
<li id=""> <li id="">

4
apps/users/templates/users/_user.html
View File

@ -47,11 +47,12 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="input-group date"> <div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <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> </div>
<span class="help-block ">{{ form.date_expired.errors }}</span> <span class="help-block ">{{ form.date_expired.errors }}</span>
</div> </div>
</div> </div>
{# {{ form.date_expired|bootstrap_horizontal }}#}
<div class="form-group"> <div class="form-group">
<label for="{{ form.enable_otp.id_for_label }}" class="col-sm-2 control-label">{% trans 'Enable OTP' %}</label> <label for="{{ form.enable_otp.id_for_label }}" class="col-sm-2 control-label">{% trans 'Enable OTP' %}</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -84,6 +85,7 @@
$('.select2').select2(); $('.select2').select2();
$('.input-group.date').datepicker({ $('.input-group.date').datepicker({
format: "yyyy-mm-dd",
todayBtn: "linked", todayBtn: "linked",
keyboardNavigation: false, keyboardNavigation: false,
forceParse: false, forceParse: false,

4
apps/users/views.py
View File

@ -120,10 +120,6 @@ class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
user_add_success_next(user) user_add_success_next(user)
return super(UserAddView, self).form_valid(form) 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): def get_success_message(self, cleaned_data):
return self.success_message % ( return self.success_message % (
reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}), reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}),