Commit 41c78111 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'master' of git.gmu.edu:srct/advisor

Conflicts:
	advisor/trajectories/forms.py
parents c763e3e9 56146d0b
......@@ -20,8 +20,12 @@ class StyledSeachForm( SearchForm ):
# build a trajectory
<<<<<<< HEAD
# create a new trajectory
class NewTrajectoryForm( ModelForm ):
=======
class CreatePersonalProgramListForm( ModelForm ):
>>>>>>> 56146d0bc3dfccfc13208302c365932288fe58be
# def __init__(self, *args, **kwargs):
class Meta:
......@@ -76,6 +80,8 @@ class NewTrajectoryForm( ModelForm ):
'placeholder' = 'Name Your Trajectory',
}),
}
class BuildTrajectoryForm(ModelForm):
model = Trajectory
class StudentEditInfoForm( ModelForm ):
# def __init__(self, *args, **kwargs):
......
......@@ -6,10 +6,10 @@ from trajecgtories.utils import *
from braces.views import LoginRequiredMixin
# a page for creating new trajectories
# @login_required
def create_trajectory(LoginRequiredMixin, CreateView):
model = Trajectory
form = CreateTrajectoryForm
@login_required
def new_list_of_programs(FormView):
template_name = 'new.html'
form = CreatePersonalProgramListForm
#programs = Program.objects.all()
#courses = Course.objects.all()
......@@ -18,7 +18,8 @@ def create_trajectory(LoginRequiredMixin, CreateView):
# "Build"
def update_trajectory(LoginRequiredMixin, UpdateView):
model = Trajectory
form = UpdateTrajectoryForm
form = BuildTrajectoryForm
template_name = 'build.html'
# student's page; shows saved trajectories
# @login_required
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment