From 590c7c45ac7437e92ce3437dfece61808034ed90 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 11 Oct 2011 17:31:05 +0200
Subject: [PATCH] rename

---
 pandora/person/models.py |  2 +-
 pandora/person/views.py  | 10 +++++-----
 pandora/title/models.py  |  2 +-
 pandora/title/views.py   | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pandora/person/models.py b/pandora/person/models.py
index 4beb62e5..c5a6cd99 100644
--- a/pandora/person/models.py
+++ b/pandora/person/models.py
@@ -62,7 +62,7 @@ class Person(models.Model):
         j = {
             'id': self.get_id(),
             'name': self.name,
-            'nameSort': self.name_sort,
+            'sortName': self.name_sort,
             'numberofnames': self.numberofnames,
         }
         if keys:
diff --git a/pandora/person/views.py b/pandora/person/views.py
index 4df412df..29508ac3 100644
--- a/pandora/person/views.py
+++ b/pandora/person/views.py
@@ -20,15 +20,15 @@ def editName(request):
     '''
         param data {
             'id': nameid,
-            'nameSort': ...
+            'sortName': ...
         }
         can contain any of the allowed keys for name 
     '''
     data = json.loads(request.POST['data'])
     person = get_object_or_404_json(models.Person, pk=ox.from26(data['id']))
     response = json_response()
-    if 'nameSort' in data:
-        person.name_sort = utils.sort_string(data['nameSort'])
+    if 'sortName' in data:
+        person.name_sort = utils.sort_string(data['sortName'])
         person.edited = True
     person.save()
     response['data'] = person.json()
@@ -56,7 +56,7 @@ def order_query(qs, sort):
             operator = ''
         key = {
             'name': 'name_sort',
-            'nameSort': 'name_sort',
+            'sortName': 'name_sort',
         }.get(e['key'], e['key'])
         order = '%s%s' % (operator, key)
         order_by.append(order)
@@ -89,7 +89,7 @@ def findNames(request):
             name, numberofnames
 
         possible keys:
-            name, nameSort, numberofnames
+            name, sortName, numberofnames
         
         return {
                 status: {
diff --git a/pandora/title/models.py b/pandora/title/models.py
index e5e36fde..48cf3392 100644
--- a/pandora/title/models.py
+++ b/pandora/title/models.py
@@ -55,7 +55,7 @@ class Title(models.Model):
         j = {
             'id': self.get_id(),
             'title': self.title,
-            'titleSort': self.title_sort,
+            'sortTitle': self.title_sort,
         }
         if keys:
             for key in j.keys():
diff --git a/pandora/title/views.py b/pandora/title/views.py
index 161ea3e4..d2d31577 100644
--- a/pandora/title/views.py
+++ b/pandora/title/views.py
@@ -21,15 +21,15 @@ def editTitle(request):
     '''
         param data {
             'id': titleid,
-            'titleSort': ...
+            'sortTitle': ...
         }
         can contain any of the allowed keys for title 
     '''
     data = json.loads(request.POST['data'])
     title = get_object_or_404_json(models.Title, pk=ox.from26(data['id']))
     response = json_response()
-    if 'titleSort' in data:
-        title.title_sort = data['titleSort']
+    if 'sortTitle' in data:
+        title.title_sort = data['sortTitle']
         title.title_sort = unicodedata.normalize('NFKD', title.title_sort)
         title.edited = True
     title.save()
@@ -57,7 +57,7 @@ def order_query(qs, sort):
         if operator != '-':
             operator = ''
         key = {
-            'titleSort': 'title_sort',
+            'sortTitle': 'title_sort',
         }.get(e['key'], e['key'])
         order = '%s%s' % (operator, key)
         order_by.append(order)
@@ -90,7 +90,7 @@ def findTitles(request):
             title, numberoftitles
 
         possible keys:
-            title, titleSort, numberoftitles
+            title, sortTitle, numberoftitles
         
         return {
                 status: {