Pull request for Mass Assignment - Team Ruby Racer #244
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CI setup and running on travis.
Causes unnecessary confusion for the developers
Customized the controller to send deliverables filtered by teams based on if the teams belong to a professor or not
- Merged changes to filter by teams from deliverables_filter_faculty Conflicts: app/controllers/deliverables_controller.rb
- Added a new professor - Linked the new professor to RE - Assigned teams to professors - Updated assignment time lines to 2013 in FSE and RE seed data - Updated student's graduation year to 2014 from 2012
Added condition in deliverables_controller to filter individual deliverables.
…ss of grading queue has changed
… both professors and students
…ot support testing with browser
…links Disabled the link's click event, then added row level click to show grading details. Note that order in which click event is disabled and, another click event is added is important.
Merge branch 'master' of github.com:tushar-dadlani/teamrubyracer-whiteboard
|
Grading Queue process for Whiteboard - Ruby Racer team |
| <div class="item-icon"><%= link_to image_tag("/images/deliverables.png", :size => "75x75", :alt => "Grading Deliverables", :title => "Grading Deliverables"), course_deliverables_path(@course) %></div> | ||
| <div class="item-link"><%= link_to "Grading #{nomenclature_assignment_or_deliverable}s", course_deliverables_path(@course) %></div> | ||
| <div class="item-icon"><%= link_to image_tag("/images/deliverables.png", :size => "75x75", :alt => "Grading Deliverables", :title => "Grading Deliverables"), course_deliverables_path(@course, :teams => "my_teams") %></div> | ||
| <div class="item-link"><%= link_to "Grading #{nomenclature_assignment_or_deliverable}s", course_deliverables_path(@course, :teams => "my_teams") %></div> |
There was a problem hiding this comment.
Note to Todd: see why this is necessary. Is there a test that relies on this for success?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following are the 5 models covered in this request:
./app/models/deliverable.rb
./app/models/deliverable_attachment.rb
./app/models/faculty_assignment.rb
./app/models/team.rb
./app/models/team_assignment.rb