diff options
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/routers.py | 5 | ||||
| -rw-r--r-- | rest_framework/templates/rest_framework/base.html | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/rest_framework/routers.py b/rest_framework/routers.py index f2d06211..169e6e8b 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -20,6 +20,7 @@ from collections import namedtuple from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch +from django.utils.datastructures import SortedDict from rest_framework import views from rest_framework.response import Response from rest_framework.reverse import reverse @@ -277,7 +278,7 @@ class DefaultRouter(SimpleRouter): """ Return a view to use as the API root. """ - api_root_dict = {} + api_root_dict = SortedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) @@ -286,7 +287,7 @@ class DefaultRouter(SimpleRouter): _ignore_model_permissions = True def get(self, request, *args, **kwargs): - ret = {} + ret = SortedDict() for key, url_name in api_root_dict.items(): try: ret[key] = reverse( diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 58e7e86c..e9d99a65 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -140,16 +140,16 @@ {% if post_form %} <ul class="nav nav-tabs form-switcher"> <li> - <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a> + <a name='html-tab' href="#post-object-form" data-toggle="tab">HTML form</a> </li> <li> - <a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a> + <a name='raw-tab' href="#post-generic-content-form" data-toggle="tab">Raw data</a> </li> </ul> {% endif %} <div class="well tab-content"> {% if post_form %} - <div class="tab-pane" id="object-form"> + <div class="tab-pane" id="post-object-form"> {% with form=post_form %} <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate> @@ -164,7 +164,7 @@ {% endwith %} </div> {% endif %} - <div {% if post_form %}class="tab-pane"{% endif %} id="generic-content-form"> + <div {% if post_form %}class="tab-pane"{% endif %} id="post-generic-content-form"> {% with form=raw_data_post_form %} <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal"> <fieldset> @@ -186,16 +186,16 @@ {% if put_form %} <ul class="nav nav-tabs form-switcher"> <li> - <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a> + <a name='html-tab' href="#put-object-form" data-toggle="tab">HTML form</a> </li> <li> - <a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a> + <a name='raw-tab' href="#put-generic-content-form" data-toggle="tab">Raw data</a> </li> </ul> {% endif %} <div class="well tab-content"> {% if put_form %} - <div class="tab-pane" id="object-form"> + <div class="tab-pane" id="put-object-form"> <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate> <fieldset> @@ -209,7 +209,7 @@ </form> </div> {% endif %} - <div {% if put_form %}class="tab-pane"{% endif %} id="generic-content-form"> + <div {% if put_form %}class="tab-pane"{% endif %} id="put-generic-content-form"> {% with form=raw_data_put_or_patch_form %} <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal"> <fieldset> |