Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Daniel W Bond
advisor
Commits
dfabed80
Commit
dfabed80
authored
Dec 23, 2013
by
Daniel W Bond
Browse files
small syntax fixes
parent
d308fa3a
Changes
5
Hide whitespace changes
Inline
Side-by-side
advisor/settings/__init__.pyc
View file @
dfabed80
No preview for this file type
advisor/settings/settings.pyc
View file @
dfabed80
No preview for this file type
advisor/settings/urls.py
View file @
dfabed80
...
...
@@ -29,7 +29,7 @@ urlpatterns = patterns('trajectories.views',
url
(
r
'^user/(?P<username>\w+)/$'
,
'student'
,
name
=
'student'
),
# creating the trajectory
url
(
r
'^user/(?Pusername>\w+)/create/(?P<trajectoryslug>\w+)/$'
,
'makeTrajectory'
,
name
=
'maketrajectory'
),
url
(
r
'^user/(?P
<
username>\w+)/create/(?P<trajectoryslug>\w+)/$'
,
'makeTrajectory'
,
name
=
'maketrajectory'
),
# comparison page
url
(
r
'^user/(?P<username>\w+)/compare/$'
,
'compare'
,
name
=
'compare'
),
...
...
advisor/trajectories/models.py
View file @
dfabed80
...
...
@@ -88,7 +88,7 @@ class Student(BaseModel):
# aka username, etc should all be here
class
Meta
:
ordering
=
(
'
name
'
,)
ordering
=
(
'
user
'
,)
def
__unicode__
(
self
):
return
self
.
name
...
...
advisor/trajectories/views.py
View file @
dfabed80
...
...
@@ -52,7 +52,7 @@ def getGenEds(programs, isHonors):
genEdList
.
append
(
firstMajorType
)
try
:
secondMajor
=
program
[
1
].
degreeType
if
firstMajorType
is
secondMajorType
if
firstMajorType
is
secondMajorType
:
genEdList
.
append
(
secondMajorType
)
return
genEdList
except
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment