Changeset 9395 for src

Timestamp:

Jul 12, 2011, 3:28:05 PM (13 years ago)

Author:

rick

Message:

We might as well want to store the results in the Django instance as well. Save some other hacks.

Location:

src/django_gheat

Files:

• gheat/admin.py (modified) (2 diffs)
• gheat/models.py (modified) (1 diff)
• settings.py (modified) (2 diffs)
• sitemedia (added)

src/django_gheat/gheat/admin.py

@@ -1 @@
-from gheat.models import Accespoint, Apparatuur, Gebruiker, MeetRondje, Meting
+from gheat.models import Accespoint, Apparatuur, Gebruiker, MeetRondje, Meting, MeetBestand
 from django.contrib import admin
 
@@ -5 +5 @@
 admin.site.register(Apparatuur)
 admin.site.register(Gebruiker)
-admin.site.register(MeetRondje)
+class MeetBestandInline(admin.TabularInline):
+  model = MeetBestand
+class MeetRondjeAdmin(admin.ModelAdmin):
+  inlines = [ MeetBestandInline, ]
+
+admin.site.register(MeetRondje, MeetRondjeAdmin)
 admin.site.register(Meting)

src/django_gheat/gheat/models.py

@@ -80 +80 @@
     return "%s - %s" % (self.gebruiker.naam, self.naam)
 
+class MeetBestand(models.Model):
+  meetrondje = models.ForeignKey(MeetRondje)
+  bestand = models.FileField(upload_to='meet-bestand/%Y/%m/%d')
+  
+
 class Meting(models.Model):
   meetrondje = models.ForeignKey(MeetRondje)

src/django_gheat/settings.py

@@ -59 +59 @@
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = os.path.join(PROJECT_HOME,'sitemedia')
+
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
@@ -75 +71 @@
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = 'sitestatic'
+STATIC_ROOT =  os.path.join(PROJECT_HOME,'sitestatic')
 
 # URL prefix for static files.