gavel-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7
committer: Hilton Shumway <hillshum@xxxxxxxxx>
branch nick: clean
timestamp: Fri 2010-04-02 19:53:39 -0600
message:
  Remove slugs from motions. The primary key is used for lookups.
modified:
  gavel/api/urls.py
  gavel/rules/api/handlers.py
  gavel/rules/models.py


--
lp:gavel
https://code.launchpad.net/~gavel-team/gavel/gavel

Your team Gavel Team is subscribed to branch lp:gavel.
To unsubscribe from this branch go to https://code.launchpad.net/~gavel-team/gavel/gavel/+edit-subscription

=== modified file 'gavel/api/urls.py'
--- gavel/api/urls.py	2010-04-02 20:14:05 +0000
+++ gavel/api/urls.py	2010-04-03 01:53:39 +0000
@@ -8,6 +8,6 @@
 
 urlpatterns = patterns('',
     url(r'^motion/$', motion_handler),
-    url(r'^motion/(?P<motion_slug>[\w-]+)/$', motion_handler),
-    url(r'^motion/(?P<motion_slug>[\w-]+)/vote/$', vote_handler),
+    url(r'^motion/(?P<pk>[\w-]+)/$', motion_handler),
+    url(r'^motion/(?P<pk>[\w-]+)/vote/$', vote_handler),
 )

=== modified file 'gavel/rules/api/handlers.py'
--- gavel/rules/api/handlers.py	2010-04-02 20:14:05 +0000
+++ gavel/rules/api/handlers.py	2010-04-03 01:53:39 +0000
@@ -10,10 +10,10 @@
     model = Motion
     
 
-    def read(self, request, motion_slug):
-        self.fields = ['slug', 'text']
+    def read(self, request, pk):
+        self.fields = ['pk', 'text']
         try:
-            motion = Motions.get(slug=motion_slug)
+            motion = Motions.get(pk=pk)
         except Motion.DoesNotExist:
             return rc.NOT_HERE
 
@@ -25,25 +25,24 @@
 
         return motion
 
-    def create(self, request, motion_slug=None):
+    def create(self, request):
         motion = Motion()
 
         motion.text = request.POST.get('text')
-        motion.slug = motion_slug or request.POST.get('slug') or ''
         motion.save()
 
-        return self.read(request, motion.slug)
+        return self.read(request, motion.pk)
     
-    def update(self, request, motion_slug):
-        motion = Motions.get(slug=motion_slug)
+    def update(self, request, pk):
+        motion = Motions.get(pk=pk)
 
         motion.text = request.PUT.get('text') or motion.text
         motion.save()
 
         return motion
 
-    def delete(self, request, motion_slug):
-        motion = Motions.get(slug=motion_slug)
+    def delete(self, request, pk):
+        motion = Motions.get(pk=pk)
         motion.delete()
 
         return rc.DELETED
@@ -53,15 +52,15 @@
     model = Vote
     fields = ('passed', 'positive', 'negative', 'abstain', 'datetime')
     
-    def read(self, request, motion_slug):
-        motion = Motions.get(slug=motion_slug)
+    def read(self, request, pk):
+        motion = Motions.get(pk=pk)
         return motion.vote
 
-    def create(self, request, motion_slug):
+    def create(self, request, pk):
         
         vote = Vote()
         
-        vote.motion = Motions.get(slug=motion_slug)
+        vote.motion = Motions.get(pk=pk)
         vote.passed = request.POST.get('passed')
         vote.positive = int(request.POST.get('positive'))
         vote.negative = int(request.POST.get('negative'))

=== modified file 'gavel/rules/models.py'
--- gavel/rules/models.py	2010-04-02 20:14:05 +0000
+++ gavel/rules/models.py	2010-04-03 01:53:39 +0000
@@ -10,15 +10,9 @@
     """
 
     text = models.TextField("Motion Text", max_length=512)
-    slug = models.SlugField("Slug", max_length=50, unique=True)
     
     def save(self, *args, **kwargs):
-        if self.slug == '':
-            self.slug = 'NULL'
-            super(Motion, self).save(*args, **kwargs)
 
-        if self.slug == 'NULL':
-            self.slug = str(self.pk)
 
         super(Motion, self).save(*args, **kwargs)