Skip to content

Hotfix 1.1.0A #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2016
Merged

Hotfix 1.1.0A #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d39661
Sort major projects correctly
mbillow Oct 17, 2016
762174b
Merge branch 'master' into develop
mbillow Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conditional/blueprints/major_project_submission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from conditional.util.flask import render_template

from conditional import db
from sqlalchemy import desc


logger = structlog.get_logger()
Expand Down Expand Up @@ -37,9 +38,8 @@ def display_major_project():
'id': p.id,
'is_owner': bool(user_name == p.uid)
} for p in
MajorProject.query]
MajorProject.query.order_by(desc(MajorProject.id))]

major_projects.reverse()
major_projects_len = len(major_projects)
# return names in 'first last (username)' format
return render_template(request,
Expand Down