0
@@ -274,14 +274,14 @@ def create_model(request):
0
 def add_author_picture(request):
0
     id = request.POST['pk']
0
     file = request.FILES['file']
0
-    filename = file['filename']
0
+    filename = file.name
0
     filebase = '%s/lifeflow/author/' % settings.MEDIA_ROOT
0
     filepath = "%s%s" % (filebase, filename)
0
     while (os.path.isfile(filepath)):
0
         filename = "_%s" % filename
0
         filepath = "%s%s" % (filebase, filename)
0
     fd = open(filepath, 'wb')
0
-    fd.write(file['content'])
0
+    fd.write(file.read())
0
     fd.close()
0
     
0
     author = Author.objects.get(pk=id)
0
@@ -299,14 +299,16 @@ def add_resource(request):
0
     file = request.FILES['file']
0
     title = request.POST['title']
0
     markdown_id = request.POST['markdown_id']
0
-    filename = file['filename']
0
+    filename = file.name
0
     filebase = '%s/lifeflow/resource/' % settings.MEDIA_ROOT
0
     filepath = "%s%s" % (filebase, filename)
0
     while (os.path.isfile(filepath)):
0
         filename = "_%s" % filename
0
         filepath = "%s%s" % (filebase, filename)
0
+    print filepath
0
     fd = open(filepath, 'wb')
0
-    fd.write(file['content'])
0
+
0
+    fd.write(file.read())
0
     fd.close()
0
     rec = Resource(title=title, markdown_id=markdown_id, content="lifeflow/resource/%s" % filename)
0
     rec.save()
0
@@ -324,7 +326,7 @@ CODE_EXTS = ["css", "html", "htm", "c", "o", "py", "lisp", "js", "xml",
0
 @login_required
0
 def display_resource(request, id):
0
     res = Resource.objects.get(pk=id)
0
-    file = res.content.split("/")[-1]
0
+    file = res.content.path.split("/")[-1]
0
     opts = {'object':res,'file':file}
0
     ext = opts['file'].split(".")[-1]
0
     opts['type'] = 'file'
0
@@ -333,7 +335,7 @@ def display_resource(request, id):
0
     elif ext in ZIP_EXTS:
0
         try:
0
             opts['type'] = "zip"
0
-            zf = ZipFile(res.get_content_filename(),'r')
0
+            zf = ZipFile(res.content.path,'r')
0
             opts['files_list'] = zf.namelist()
0
             zf.close()
0
         except IOError:
0
@@ -341,7 +343,7 @@ def display_resource(request, id):
0
     else:
0
         try:
0
             lexer = get_lexer_for_filename(file)
0
-            f = open(res.get_content_filename(),'r')
0
+            f = open(res.content.path,'r')
0
             data = f.read()
0
             f.close()
0
             opts['highlighted_code'] = highlight(data,lexer,HtmlFormatter())

0
@@ -307,7 +307,7 @@ class Flow(models.Model):
0
 
0
 
0
 class Language(models.Model):
0
-    title = models.CharField(max_length=50, core=True)
0
+    title = models.CharField(max_length=50)
0
     slug = models.SlugField()
0
 
0
     def __unicode__(self):
0
@@ -415,7 +415,7 @@ class Series(models.Model):
0
     """
0
     A series is a collection of Entry instances on the same theme.
0
     """
0
-    title = models.CharField(max_length=200, core=True)
0
+    title = models.CharField(max_length=200)
0
     slug= models.SlugField()
0
 
0
     class Meta:
0
@@ -476,7 +476,7 @@ class SiteToNotify(models.Model):
0
 
0
 class Tag(models.Model):
0
     "Tags are associated with Entry instances to describe their contents."
0
-    title = models.CharField(max_length=50, core=True)
0
+    title = models.CharField(max_length=50)
0
     slug = models.SlugField()
0
 
0