diff options
| -rw-r--r-- | example_project/urls.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models.py | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/example_project/urls.py b/example_project/urls.py index 5fbe88542..1bed62256 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -9,7 +9,6 @@ admin.autodiscover() urlpatterns = patterns('', (r'^accounts/', include('registration.urls')), - (r'^admin/', include(admin.site.urls)), ) APP_LIST = ['archaeological_files', 'archaeological_operations', @@ -27,3 +26,7 @@ urlpatterns += patterns('', urlpatterns += patterns('ishtar_common.views', url(r'^$', 'index', name='start'), ) + +urlpatterns += patterns('', + (r'^admin/', include(admin.site.urls)), +) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3df557806..4aa5e4949 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -77,8 +77,14 @@ class ValueGetter(object): else: values[prefix + field_name] = value values['KEYS'] = u'\n'.join(values.keys()) + value_list = [] + for key in values.keys(): + if key in ('KEYS', 'VALUES'): + continue + value_list.append((key, unicode(values[key]))) values['VALUES'] = u'\n'.join( - [u"%s: %s" % (k, unicode(values[k])) for k in values]) + [u"%s: %s" % (k, v) for k, v in sorted(value_list, + key=lambda x:x[0])]) return values @classmethod |