diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 208: Merge 0.3b4 changes (fixes to API pages)

Message ID 20110713185122.26569.24259.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki July 13, 2011, 6:51 p.m. UTC 
Merge authors:
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~linaro-validation/lava-server/0.3b4/+merge/67876
  proposed by: Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 208 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Wed 2011-07-13 20:49:36 +0200
message:
  Merge 0.3b4 changes (fixes to API pages)
modified:
  lava_server/__init__.py
  lava_server/templates/linaro_django_xmlrpc/_base.html
  lava_server/templates/linaro_django_xmlrpc/api.html


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_server/__init__.py'
--- lava_server/__init__.py	2011-07-12 15:09:34 +0000
+++ lava_server/__init__.py	2011-07-13 18:28:51 +0000
@@ -17,4 +17,4 @@ 
 # along with LAVA Server.  If not, see <http://www.gnu.org/licenses/>.
 
 
-__version__ = (0, 3, 0, "beta", 3)
+__version__ = (0, 3, 0, "beta", 4)

=== modified file 'lava_server/templates/linaro_django_xmlrpc/_base.html'
--- lava_server/templates/linaro_django_xmlrpc/_base.html	2011-07-13 12:48:44 +0000
+++ lava_server/templates/linaro_django_xmlrpc/_base.html	2011-07-13 18:25:34 +0000
@@ -10,7 +10,7 @@ 
 {% block extension_navigation %}
 <div id="lava-server-extension-navigation" class="lava-server-sub-toolbar">
   <ul>
-    <li><a href="{% url linaro_django_xmlrpc.views.help %}">{% trans "API Help" %}</a></li>
+    <li><a href="{% url lava.api_help %}">{% trans "API Help" %}</a></li>
     <li><a href="{% url linaro_django_xmlrpc.views.tokens %}">{% trans "Authentication Tokens" %}</a></li>
   </ul>
 </div>
@@ -19,5 +19,5 @@ 
 
 {% block breadcrumbs %}
 {{ block.super }}
-<li><a href="{% url linaro_django_xmlrpc.views.handler %}">{% trans "API Help" %}</a></li>
+<li><a href="{% url lava.api_help %}">{% trans "API Help" %}</a></li>
 {% endblock %}

=== modified file 'lava_server/templates/linaro_django_xmlrpc/api.html'
--- lava_server/templates/linaro_django_xmlrpc/api.html	2011-07-13 10:24:49 +0000
+++ lava_server/templates/linaro_django_xmlrpc/api.html	2011-07-13 18:27:25 +0000
@@ -17,8 +17,8 @@ 
 client. For example, in python you can do this:</p>
 <pre>
 import xmlrpclib
-server = xmlrpclib.ServerProxy("{{ site_url }}{% url linaro_django_xmlrpc.views.handler %}")
-print server.version()
+server = xmlrpclib.ServerProxy("{{ site_url }}{% url lava.api_handler %}")
+print server.system.listMethods()
 </pre>
 
 <h2>Available functions</h2>