Small photo fixes

[sommitrealweird.git] / sommitrealweird / bpcms / models.py

diff --git a/sommitrealweird/bpcms/models.py b/sommitrealweird/bpcms/models.py
index ad88e4ab14d2de1654db30c83b1540035f7fd73e..bf2b93b019086fc551e1df331b0664a7568c86c7 100644 (file)
--- a/sommitrealweird/bpcms/models.py
+++ b/sommitrealweird/bpcms/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.db import models

-from bpcms.content_val import is_allowed_name

 from django.conf import settings
 from django.conf import settings

+from django.contrib import admin

 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),
 
 FORMAT_CHOICES = (
         ('rst', 'reStructuredText'),


@@ -8,11 +8,11 @@ FORMAT_CHOICES = (
     )
 
 class Document(models.Model):
     )
 
 class Document(models.Model):

-    title = models.CharField(maxlength=150)
+    title = models.CharField(max_length=150)

     islive = models.BooleanField()
     folder = models.ForeignKey('Folder', null=True, blank=True)
     islive = models.BooleanField()
     folder = models.ForeignKey('Folder', null=True, blank=True)

-    format = models.CharField(maxlength=10, choices=FORMAT_CHOICES)
-    slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_allowed_name,])
+    format = models.CharField(max_length=10, choices=FORMAT_CHOICES)
+    slug = models.SlugField()

     content = models.TextField()
 
     def __str__(self):
     content = models.TextField()
 
     def __str__(self):


@@ -47,21 +47,18 @@ class Document(models.Model):
 
         return "%s%s%s/" %(settings.BPCMS_ROOT, folderstring, self.slug)
 
 
         return "%s%s%s/" %(settings.BPCMS_ROOT, folderstring, self.slug)
 

-    class Admin:
-        pass
-

 class Folder(models.Model):
 class Folder(models.Model):

-    title = models.CharField(maxlength=150)
-    slug = models.SlugField(prepopulate_from=("title",), validator_list=[is_allowed_name,])
+    title = models.CharField(max_length=150)
+    slug = models.SlugField()

     parent = models.ForeignKey('self', null=True, blank=True)
 
     def __str__(self):
         return self.__unicode__()
 
     def __unicode__(self):
     parent = models.ForeignKey('self', null=True, blank=True)
 
     def __str__(self):
         return self.__unicode__()
 
     def __unicode__(self):

-        return u'%s' %(self.title)
+        return u'%s - %s' %(self.get_path(), self.title)

 
 

-    def get_basic_url(self):
+    def get_path(self):

         folders = []
         curfolder = self
         while curfolder != None:
         folders = []
         curfolder = self
         while curfolder != None:


@@ -73,7 +70,7 @@ class Folder(models.Model):
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 
         if folderstring != u'':
             folderstring = "%s/" %(folderstring,)
 

-        return "%s%s" %(settings.BPCMS_ROOT, folderstring)
-
-    class Admin:
-        pass
+        return folderstring
+        
+    def get_basic_url(self):
+        return "%s%s" %(settings.BPCMS_ROOT, self.get_path())