Merge 5bfd3b5 into 08d332d

.gitignore

@@ -1,11 +1,5 @@
-# teamwork-project .gitignore
-
-# Ignoring migrations during development
-#**/migrations/*
-
 # Ignore media folder
 teamwork/media/**
-# media/csv_files/**
 
 # Database files
 .DS_Store
@@ -15,6 +9,9 @@ teamwork/media/**
 *.sublime-project
 *.sublime-workspace
 
+# Vscode
+*.vscode/
+
 # Suggestions from heroku-django-template
 venv
 *.pyc

teamwork/apps/courses/views/BaseView.py

@@ -4,6 +4,7 @@
 from django.http import (HttpResponse, HttpResponseBadRequest,
                          HttpResponseRedirect)
 from django.core.urlresolvers import reverse
+from django.contrib import messages
 
 from teamwork.apps.courses.forms import JoinCourseForm
 from teamwork.apps.courses.models import Course, Enrollment

teamwork/apps/courses/views/CourseView.py

@@ -136,7 +136,7 @@ def edit_assignment(request, slug):
             ass.ass_number = ass_number
             ass.save()
         else:
-            print("FORM ERRORS: ", form.errors)
+            print("FORM ERRORS: ", assignmentForm.errors)
 
         return redirect(view_one_course,course.slug)
 

teamwork/settings.py

@@ -31,6 +31,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 # DEBUG is set in .env file. See etc/example.env
 DEBUG = config('DEBUG', default=False, cast=bool)
+USE_POSTGRES_LOCAL = config('USE_POSTGRES_LOCAL', default=False, cast=bool)
 
 # Application definition
 
@@ -136,8 +137,14 @@
             'PORT':     '',
         }
     }
-
-# Setup the database using dj based on the DATABASE_URL set in .env
+# Connect to postgres db described by POSTGRES_DATABASE_URL in .env file
+elif USE_POSTGRES_LOCAL:
+    DATABASES = {
+        'default': dj_database_url.config(
+            default=config('POSTGRES_DATABASE_URL')
+        )
+    }
+# Connect to sqlite3 db described by DATABASE_URL in .env file
 else:
     DATABASES = {
         'default': dj_database_url.config(