Merge lp:~linaro-validation/linaro-django-xmlrpc/edit-token into lp:~linaro-validation/linaro-django-xmlrpc/trunk

[Zygmunt Krynicki]

Add view for editing token descriptions + some minor changes here and there

[Michael Hudson-Doyle (mwhudson)]

All looks good, I'll merge.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-05-26 23:50:33 +0000
+++ .bzrignore	2011-05-30 09:57:29 +0000
@@ -1,3 +1,5 @@
 *.egg-info
 *.sqlite
 test.db
+build
+dist

=== added file 'linaro_django_xmlrpc/templates/linaro_django_xmlrpc/edit_token.html'
--- linaro_django_xmlrpc/templates/linaro_django_xmlrpc/edit_token.html	1970-01-01 00:00:00 +0000
+++ linaro_django_xmlrpc/templates/linaro_django_xmlrpc/edit_token.html	2011-05-30 09:57:29 +0000
@@ -0,0 +1,10 @@
+{% extends "django_testproject/base.html" %}
+
+{% block content %}
+<h1>Edit token {{ token.pk }}</h1>
+<form action="{% url linaro_django_xmlrpc.views.edit_token token.pk %}" method="POST">
+  {% csrf_token %}
+  {{ form.as_table }}
+  <input type="submit" value="Submit" />
+</form>
+{% endblock %}

=== modified file 'linaro_django_xmlrpc/templates/linaro_django_xmlrpc/tokens.html'
--- linaro_django_xmlrpc/templates/linaro_django_xmlrpc/tokens.html	2011-05-27 03:02:23 +0000
+++ linaro_django_xmlrpc/templates/linaro_django_xmlrpc/tokens.html	2011-05-30 09:57:29 +0000
@@ -4,12 +4,13 @@
 {% block content %}
 <h1>Authentication tokens</h1>
 {% if token_list %}
-<table>
+<table border="1">
   <tr>
     <th>Description</th>
     <th>Created on</th>
     <th>Last used on</th>
     <th>Secret</th>
+    <th>Actions</th>
   </tr>
   {% for token in token_list %}
   <tr>
@@ -18,10 +19,11 @@
     <td>{{ token.last_used_on|default_if_none:"Never" }}</td>
     <td>
       <button id="button_{{ forloop.counter }}" onclick='document.getElementById("secret_{{ forloop.counter }}").style.display="block"; this.style.display="none";'>Show</button>
-      <code id="secret_{{ forloop.counter }}" style="display: none;">{{ token.secret }}</code>
+      <code style="overflow: auto; width: 25em; display:none;" id="secret_{{ forloop.counter }}">{{ token.secret }}</code>
     </td>
     <td>
       <a href="{% url linaro_django_xmlrpc.views.delete_token token.pk %}">delete this token</a>
+      <a href="{% url linaro_django_xmlrpc.views.edit_token token.pk %}">edit the description</a>
     </td>
   </tr>
   {% endfor %}
@@ -29,5 +31,5 @@
 {% else %}
 <p>There are no tokens associated with your account yet</p>
 {% endif %}
-<p>You can <a href="{% url linaro_django_xmlrpc.views.create_token %}">create authentication tokens</a> manually.</p>
+<p>You can <a href="{% url linaro_django_xmlrpc.views.create_token %}">create new authentication token</a>.</p>
 {% endblock %}

=== modified file 'linaro_django_xmlrpc/test_project/manage.py'
--- linaro_django_xmlrpc/test_project/manage.py	2011-05-16 11:30:50 +0000
+++ linaro_django_xmlrpc/test_project/manage.py	2011-05-30 09:57:29 +0000
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
 try:
-    import settings  # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+    from linaro_django_xmlrpc.test_project import settings
+except ImportError as ex:
+    import logging
+    logging.exception("Unable to import application settings")
+    raise SystemExit(ex)
 
 if __name__ == "__main__":
     execute_manager(settings)

=== modified file 'linaro_django_xmlrpc/tests.py'
--- linaro_django_xmlrpc/tests.py	2011-05-30 09:51:43 +0000
+++ linaro_django_xmlrpc/tests.py	2011-05-30 09:57:29 +0000
@@ -24,7 +24,6 @@
 
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
-from django.template import RequestContext
 from django_testscenarios.ubertest import TestCase, TestCaseWithScenarios
 
 from linaro_django_xmlrpc.models import (

=== modified file 'linaro_django_xmlrpc/urls.py'
--- linaro_django_xmlrpc/urls.py	2011-05-26 23:50:33 +0000
+++ linaro_django_xmlrpc/urls.py	2011-05-30 09:57:29 +0000
@@ -26,4 +26,5 @@
     url(r'^tokens/$', "tokens"),
     url(r'^tokens/create/$', "create_token"),
     url(r'^tokens/(?P<object_id>\d+)/delete/$', "delete_token"),
+    url(r'^tokens/(?P<object_id>\d+)/edit/$', "edit_token"),
 )

=== modified file 'linaro_django_xmlrpc/views.py'
--- linaro_django_xmlrpc/views.py	2011-05-30 09:51:43 +0000
+++ linaro_django_xmlrpc/views.py	2011-05-30 09:57:29 +0000
@@ -21,6 +21,7 @@
 """
 
 import base64
+import logging
 
 from django.contrib.auth.decorators import login_required
 from django.contrib.csrf.middleware import csrf_exempt
@@ -71,7 +72,6 @@
             try:
                 user = AuthToken.get_user_for_secret(username, secret)
             except Exception:
-                import logging
                 logging.exception("bug")
             if user is None:
                 response = HttpResponse("Invalid token", status=401)
@@ -85,6 +85,8 @@
         response['Content-length'] = str(len(response.content))
         return response
     else:
+        # Split this to different view, redirect.
+        # TODO: check xml-rpc spec to see what is recommended on GET requests.
         system = SystemAPI(mapper)
         methods = [{
             'name': method,
@@ -139,7 +141,10 @@
         form = AuthTokenForm()
     return render_to_response(
         "linaro_django_xmlrpc/create_token.html",
-        {"form": form}, RequestContext(request))
+        {
+            "form": form,
+        },
+        RequestContext(request))
 
 
 @login_required
@@ -155,3 +160,23 @@
             'token': token,
         },
         RequestContext(request))
+
+
+@login_required
+def edit_token(request, object_id):
+    token = get_object_or_404(AuthToken, pk=object_id, user=request.user)
+    if request.method == "POST":
+        form = AuthTokenForm(request.POST, instance=token)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(
+                reverse("linaro_django_xmlrpc.views.tokens"))
+    else:
+        form = AuthTokenForm(instance=token)
+    return render_to_response(
+        "linaro_django_xmlrpc/edit_token.html",
+        {
+            "token": token,
+            "form": form,
+        },
+        RequestContext(request))

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2011-05-30 09:57:29 +0000
@@ -0,0 +1,5 @@
+[upload_docs]
+upload-dir=build/sphinx/html
+
+[upload]
+sign=True