Skip to content

Commit

Permalink
feat(groups): Add groups checkboxes to form (not functional)
Browse files Browse the repository at this point in the history
Signed-off-by: microlith57 <microlith57@gmail.com>
  • Loading branch information
microlith57 committed Dec 18, 2018
1 parent 6f69a2a commit 0f597cf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/controllers/activities_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,16 @@ def activity_params
:description,
:activity_type,
:risk,
:groups,
:approve)
end

def activity_params_no_approve
params.require(:activity).permit(:name,
:description,
:activity_type,
:risk)
:risk,
:groups)
end

def would_change(some_params, activity)
Expand Down
1 change: 1 addition & 0 deletions app/views/activities/_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
collection: activity.valid_types
= f.input :risk, as: :radio,
collection: activity.valid_risks
= f.input :groups, as: :check_boxes
= render 'examples'
= f.actions do
= f.action :submit, as: :button
Expand Down
6 changes: 6 additions & 0 deletions app/views/activities/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
= t("labels.activity.risk.#{@activity.risk}")
%em
= @activity.description || t('labels.activity.no_description')
%p
In groups:
%ol
- @activity.groups.each do |group|
%li
= link_to group.name, group
%p
- if can? :edit, @activity
= link_to t('buttons.activity.edit'), edit_activity_path(@activity)
Expand Down

0 comments on commit 0f597cf

Please sign in to comment.