cleanup imports and syntax warnings

pandora/text/models.py

@@ -5,11 +5,6 @@ from datetime import datetime
 
 from django.db import models
 from django.contrib.auth.models import User
-from django.conf import settings
-
-import ox
-from ox.django import fields
-from ox.utils import json
 
 
 class News(models.Model):
@@ -29,6 +24,7 @@ class News(models.Model):
     def get_absolute_url(self):
         return '/text/%s' % self.slug
 
+
 class Text(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
@@ -46,6 +42,7 @@ class Text(models.Model):
     def get_absolute_url(self):
         return '/text/%s' % self.slug
 
+
 class Image(models.Model):
     image = models.ImageField(upload_to='text/image')
     caption = models.CharField(max_length=255, default="")
@@ -53,10 +50,10 @@ class Image(models.Model):
     def get_absolute_url(self):
         return self.image.url
 
+
 class Attachment(models.Model):
     file = models.FileField(upload_to='text/attachment')
     caption = models.CharField(max_length=255, default="")
 
     def get_absolute_url(self):
         return self.file.url
-

pandora/text/views.py

@@ -2,23 +2,15 @@
 # vi:si:et:sw=4:sts=4:ts=4
 from __future__ import division
 
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User
-from django.db.models import Q, Avg, Count, Sum
-from django.http import HttpResponse, Http404
-from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404, redirect
-from django.template import RequestContext
-from django.conf import settings
 
 from ox.utils import json
 from ox.django.decorators import login_required_json
 from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
-from ox.django.http import HttpFileResponse
-import ox
 
 import models
 from api.actions import actions
 
+
 def getNews(request):
     '''
         param data
@@ -33,6 +25,23 @@ def getNews(request):
     return render_to_json_response(response)
 actions.register(getNews)
 
+
+@login_required_json
+def editNews(request):
+    '''
+        param data
+            string id
+
+        return page
+    '''
+    response = json_response({})
+    itemId = json.loads(request.POST['data'])
+    item = get_object_or_404_json(models.Text, pk=itemId)
+    response['data']['page'] = item.html()
+    return render_to_json_response(response)
+actions.register(editNews)
+
+
 def findNews(request):
     '''
     '''
@@ -40,6 +49,7 @@ def findNews(request):
     return render_to_json_response(response)
 actions.register(findNews)
 
+
 def getText(request):
     '''
         param data
@@ -54,10 +64,26 @@ def getText(request):
     return render_to_json_response(response)
 actions.register(getText)
 
+
+@login_required_json
+def editText(request):
+    '''
+        param data
+            string id
+
+        return page
+    '''
+    response = json_response({})
+    itemId = json.loads(request.POST['data'])
+    item = get_object_or_404_json(models.Text, pk=itemId)
+    response['data']['page'] = item.html()
+    return render_to_json_response(response)
+actions.register(editText)
+
+
 def findText(request):
     '''
     '''
     response = json_response({})
     return render_to_json_response(response)
 actions.register(findText)
-