add admin user listing

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index b4be605cbae1de8feeb48d31c783efd0f7a7add5..1519873d50ab268abc35f38f505b515cfa133c21 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 4a97f5bfa1f515112fce8400735c26cde3f62a77..d3591816258c15e77426efe995e90ccd58cd5ba6 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -833,6 +833,10 @@ msgstr "Administration générale"
 msgid "Enumerations"
 msgstr "Énumérations"
 
+#: templates/telemeta_default/admin.html:13
+msgid "Users"
+msgstr "Utilisateurs"
+
 #: web.base.py:955
 msgid "Access not allowed"
 msgstr "Accès non autorisé"

diff --git a/telemeta/templates/telemeta/admin_users.html b/telemeta/templates/telemeta/admin_users.html
new file mode 100644 (file)
index 0000000..774d791
--- /dev/null
+++ b/telemeta/templates/telemeta/admin_users.html
@@ -0,0 +1 @@
+{% extends "telemeta_default/admin_users.html" %}

diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html
index 61626c3a9db35e41788fb1fbfd3553064a116e03..483b1b3f5e318d3e52e775ee0287e27c2912c625 100644 (file)
--- a/telemeta/templates/telemeta_default/admin.html
+++ b/telemeta/templates/telemeta_default/admin.html
@@ -12,9 +12,10 @@
 <br />
 <div class="tabs">
 <ul>
-<li><a href="/admin/general/">{% trans "General administration" %}</a></li>
-<li><a href="/admin/enumerations/">{% trans "Enumerations" %}</a></li>
-<li><a href="/admin/instruments/">{% trans "Instruments" %}</a></li>
+<li><a href="{% url telemeta-admin-general %}">{% trans "General administration" %}</a></li>
+<li><a href="{% url telemeta-admin-users %}">{% trans "Users" %}</a></li>
+<li><a href="{% url telemeta-admin-enumerations %}">{% trans "Enumerations" %}</a></li>
+<li><a href="{% url telemeta-instrument-edit %}">{% trans "Instruments" %}</a></li>
 </ul>
 </div>
 {% block tab %}

diff --git a/telemeta/templates/telemeta_default/admin_instruments.html b/telemeta/templates/telemeta_default/admin_instruments.html
index 2794b7bf9227da5bda25c76cd337314e9739fbaf..5a3fa5f3e960c06adb3bb73e2d842f3cefcf3b59 100644 (file)
--- a/telemeta/templates/telemeta_default/admin_instruments.html
+++ b/telemeta/templates/telemeta_default/admin_instruments.html
@@ -3,47 +3,18 @@
 {% load i18n %}
 
 {% block tabcontents %}
- <h4>{% trans "Instruments" %}</h4>
+ <h4>{% trans "Users" %}</h4>
 
- <form class="addnew" id="addenum" method="post"
-        action="{% url telemeta-admin-instruments %}">{% csrf_token %}
-  <fieldset>
-   <legend>{% trans "Add entry" %}</legend>
-   <div class="field">
-    <label>{% trans "Name" %}: <input type="text" name="value"></label>
-
-   </div>
-   <div class="buttons">
-    <input type="submit" name="add" value="{% trans 'Add' %}">
-   </div>
-  </fieldset>
- </form>
- {% if instruments %}
- <form method="POST" action="{% url telemeta-admin-instruments %}">{% csrf_token %}
-  <table class="listing">
-   <thead>
-    <tr><th class="sel">&nbsp;</th><th>{% trans "Name"%}</th>
-
-    </tr>
-   </thead><tbody>
-    {% for instrument in instruments %}
-    <tr>
-     <td><input type="checkbox" name="sel" value="{{instrument.id}}" /></td>
-     <td>
-        {{instrument.name}}</td>
-    </tr>
+ {% if users %}
+   <ul>
+    {% for user in users %}
+    <li>{{user.username}}</li>
     {% endfor %}
-    </tbody>
-  </table>
-  <div class="buttons">
-   <input type="submit" name="remove" value="{% trans 'Remove selected items' %}" />
-  </div>
- </form>
+    </ul>
  {% else %}
-    <p class="help">{% trans "No instruments" %}</p>
+    <p class="help">{% trans "No users" %}</p>
  {% endif %}
 
-  <br style="clear: right"/>
 {% endblock %}
 
 

diff --git a/telemeta/templates/telemeta_default/admin_users.html b/telemeta/templates/telemeta_default/admin_users.html
new file mode 100644 (file)
index 0000000..9e6b371
--- /dev/null
+++ b/telemeta/templates/telemeta_default/admin_users.html
@@ -0,0 +1,19 @@
+{% extends "telemeta/admin.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+{% block tabcontents %}
+ <h4>{% trans "Users" %}</h4>
+
+ {% if users %}
+    {% for user in users %}
+     <li><a href="{% url telemeta-profile-detail user.username %}">{{user.username}}</a></li>
+    {% endfor %}
+ {% else %}
+    <p class="help">{% trans "No users" %}</p>
+ {% endif %}
+
+{% endblock %}
+
+
+

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 19f1ff77d5ad178d226c1c7e1230ac4283d7190c..5b3aefe8530b843b02addb7ab45c7e46afce3dea 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -135,6 +135,7 @@ urlpatterns = patterns('',
     url(r'^admin/$', web_view.admin_index, name="telemeta-admin"),        
     url(r'^admin/general/$', web_view.admin_general, name="telemeta-admin-general"),        
     url(r'^admin/enumerations/$', web_view.admin_enumerations, name="telemeta-admin-enumerations"),       
+    url(r'^admin/users/$', web_view.admin_users, name="telemeta-admin-users"),       
     
     # instruments administration
     url(r'^admin/instruments/$', 

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index fad80e448ad0bcdde1bc3ceb4d690d89174491f6..972747690c482b223402512147a91e8322dbcbaa 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -638,6 +638,10 @@ class WebView(object):
     @method_decorator(permission_required('sites.change_site'))
     def admin_enumerations(self, request):
         return render(request, 'telemeta/admin_enumerations.html', self.__get_admin_context_vars())
+    @method_decorator(permission_required('sites.change_site'))
+    def admin_users(self, request):
+        users = User.objects.all()
+        return render(request, 'telemeta/admin_users.html', {'users': users})
 
     # ENUMERATIONS
     def __get_enumerations_list(self):