Merge pull request #12 from grahamu/fix5

Converting views to Generic CBVs

Author: paltman

.gitignore

@@ -9,3 +9,4 @@ MANIFEST
 docs/_build/
 htmlcov/
 .eggs/
+.python-version

pinax/documents/forms.py

@@ -6,32 +6,35 @@
     def user_display(user):
         return user.username
 
-from .models import Folder
+from .models import (
+    Document,
+    Folder,
+)
 
 
-class FolderCreateForm(forms.Form):
+class FolderCreateForm(forms.ModelForm):
 
-    name = forms.CharField(max_length=140)
-    parent = forms.ModelChoiceField(
-        queryset=Folder.objects.none(),
-        widget=forms.HiddenInput,
-        required=False,
-    )
+    class Meta:
+        model = Folder
+        fields = ["name", "parent"]
+        widgets = {
+            "parent": forms.HiddenInput,
+        }
 
     def __init__(self, *args, **kwargs):
         folders = kwargs.pop("folders")
         super(FolderCreateForm, self).__init__(*args, **kwargs)
         self.fields["parent"].queryset = folders
 
 
-class DocumentCreateForm(forms.Form):
+class DocumentCreateForm(forms.ModelForm):
 
-    folder = forms.ModelChoiceField(
-        queryset=Folder.objects.none(),
-        widget=forms.HiddenInput,
-        required=False,
-    )
-    file = forms.FileField()
+    class Meta:
+        model = Document
+        fields = ["folder", "file"]
+        widgets = {
+            "folder": forms.HiddenInput,
+        }
 
     def __init__(self, *args, **kwargs):
         folders = kwargs.pop("folders")

pinax/documents/models.py

@@ -133,12 +133,8 @@ def shared_parent(self):
 
     def can_share(self, user):
         """
-        Determines the shared parent and checks if given user is the author
-        of the folder.
+        Ensures folder is top-level and `user` is the author.
         """
-        # sp = self.shared_parent()
-        # return sp.author_id == user.id and self == sp
-        # only share folders that live at the top-level
         return self.parent_id is None and self.author_id == user.id
 
     def share(self, users):
@@ -165,7 +161,7 @@ def share(self, users):
 class Document(models.Model):
 
     name = models.CharField(max_length=255)
-    folder = models.ForeignKey(Folder, null=True)
+    folder = models.ForeignKey(Folder, null=True, blank=True)
     author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="+")
     created = models.DateTimeField(default=timezone.now)
     modified = models.DateTimeField(default=timezone.now)
@@ -263,7 +259,7 @@ def download_url(self):
 class MemberSharedUser(models.Model):
 
     user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    # @@@ priviledges
+    # @@@ privileges
 
     class Meta:
         abstract = True

pinax/documents/tests/models.py

@@ -0,0 +1,5 @@
+from test_plus.test import TestCase as PlusTestCase
+
+
+class TestCase(PlusTestCase):
+    pass