Browse Source

udpate some bug

pull/530/head
ibuler 8 years ago
parent
commit
be99eb82e8
  1. 6
      apps/users/templates/users/_user_import_modal.html
  2. 4
      apps/users/templates/users/user_list.html
  3. 3
      apps/users/views.py

6
apps/users/templates/users/_user_import_modal.html

@ -3,13 +3,11 @@
{% block modal_id %}user_import_modal{% endblock %}
{% block modal_title%}{% trans "Import User" %}{% endblock %}
{% block modal_body %}
<p class="text-success text-center">{% trans "Hint: your excel should organized in the following format." %}</p>
<p class="text-success text-center">{% trans "* You should have a very worksheet named `users`." %}</p>
<p class="text-success text-center">{% trans "* Rows in this worksheet: username, email, enable_opt(0, 1), role(one of ['Admin', 'User'])" %}</p>
<p class="text-success">{% trans " * CSV format should be same as export" %}</p>
<form method="post" class="form-horizontal" action="{% url 'users:user-import' %}" id="fm_user_import" enctype="multipart/form-data">
{% csrf_token %}
<div class="form-group">
<label class="control-label col-sm-2 col-lg-2 " for="id_excel">{% trans "Excel" %}</label>
<label class="control-label col-sm-2 col-lg-2 " for="id_excel">{% trans "CSV" %}</label>
<div class=" col-sm-9 col-lg-9 ">
<input id="id_excel" type="file" name="excel" />
</div>

4
apps/users/templates/users/user_list.html

@ -3,8 +3,8 @@
{% block table_search %}
<div class="html5buttons">
<div class="dt-buttons btn-group">
<a class="btn btn-default buttons-pdf" tabindex="0" href="#">
<span>PDF</span></a>
{# <a class="btn btn-default buttons-pdf" tabindex="0" href="#">#}
{# <span>PDF</span></a>#}
<a class="btn btn-default buttons-csv" tabindex="0" href="#">
<span>CSV</span>
</a>

3
apps/users/views.py

@ -3,7 +3,9 @@
from __future__ import unicode_literals
import json
import uuid
from io import BytesIO
from reportlab.pdfgen import canvas
import unicodecsv as csv
from django import forms
from django.utils import timezone
@ -570,3 +572,4 @@ class ExportUserCsvView(View):
cache.set(spm, users_id, 300)
url = reverse('users:export-user-csv') + '?spm=%s' % spm
return JsonResponse({'redirect': url})

Loading…
Cancel
Save