Commit 1b2ac90d authored by Chrysanthi Lagodimou's avatar Chrysanthi Lagodimou
Browse files

review changes and correct filtering

parent 65d446aa
Pipeline #30571 passed with stage
in 36 minutes and 5 seconds
......@@ -26,10 +26,10 @@ class SemesterProcessVolunteersController < ApplicationController
review_semester_semester_process_volunteer_path(@semester_process_volunteer),
notice: 'Successfully reviewed.'
)
rescue ActiveRecord::RecordInvalid => exception
null_reviewed
@hours.reload
render :review_semester, notice: exception
rescue ActiveRecord::RecordInvalid => exception
null_reviewed
@hours.reload
render :review_semester, notice: exception
end
end
......@@ -66,7 +66,8 @@ class SemesterProcessVolunteersController < ApplicationController
params.require(:semester_process_volunteer).permit(
volunteer_attributes: [:waive, :iban, :bank],
semester_feedback: [:goals, :achievements, :future, :comments, :conversation],
hour: [:hours])
hour: [:hours]
)
end
def set_semester_process_volunteer
......
- semester_filter = params[:semester].presence
.btn-group
button.btn.btn-default.dropdown-toggle type='button' data-toggle='dropdown' aria-label="Semester" aria-haspopup='true' aria-expanded='false' class="btn-md"
= "Semester: "
= semester_filter ? params[:semester] : @semester
= params[:semester] || @semester
= ' '
span.caret aria-hidden='true'
ul.dropdown-menu
li
-@semester.collection.each do |(name, code)|
li= link_to name[0..15], request_params_filter(semester: code)
-@semester.collection.each do |name, semester_code|
li= link_to name[0..15], semester_process_volunteers_path(semester: semester_code)
Supports Markdown
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