Download as
Browse Code »

Commit 88beabe7de01a091529c228c55a62f465f9a2f7c

Authored by Heitor
Committed by Diego Camarinha
1 parent b7e10d2d
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Public parameter on creating and editing reading group / configuration 

Signed off by: Pedro Scocco <pedroscocco@gmail.com>
Showing 2 changed files with 12 additions and 4 deletions   Show diff stats
app/controllers/kalibro_configurations_controller.rb
  Diff comments   View file @88beabe
... ... @@ -7,7 +7,6 @@ class KalibroConfigurationsController &lt; ApplicationController
7 7 # GET /kalibro_configurations/new
8 8 def new
9 9 @kalibro_configuration = KalibroConfiguration.new
10   - @attributes = @kalibro_configuration.attributes
11 10 end
12 11  
13 12 # GET /kalibro_configurations
... ... @@ -41,10 +40,10 @@ class KalibroConfigurationsController &lt; ApplicationController
41 40 @attributes = @kalibro_configuration.attributes
42 41 end
43 42  
44   -
45 43 def update
46 44 set_kalibro_configuration
47 45 if @kalibro_configuration.update(kalibro_configuration_params)
  46 + @kalibro_configuration.attributes.update(public: attributes_params)
48 47 redirect_to(kalibro_configuration_path(@kalibro_configuration.id))
49 48 else
50 49 render "edit"
... ... @@ -76,10 +75,14 @@ class KalibroConfigurationsController &lt; ApplicationController
76 75 params[:kalibro_configuration]
77 76 end
78 77  
  78 + def attributes_params
  79 + params[:attributes][:public] == "1"
  80 + end
  81 +
79 82 # Extracted code from create action
80 83 def create_and_redir(format)
81 84 if @kalibro_configuration.save
82   - current_user.kalibro_configuration_attributes.create kalibro_configuration_id: @kalibro_configuration.id
  85 + current_user.kalibro_configuration_attributes.create(kalibro_configuration_id: @kalibro_configuration.id, public: attributes_params)
83 86  
84 87 format.html { redirect_to kalibro_configuration_path(@kalibro_configuration.id), notice: t('successfully_created', :record => @kalibro_configuration.model_name.human) }
85 88 format.json { render action: 'show', status: :created, location: @kalibro_configuration }
... ...
app/controllers/reading_groups_controller.rb
  Diff comments   View file @88beabe
... ... @@ -38,6 +38,7 @@ class ReadingGroupsController &lt; ApplicationController
38 38  
39 39 def update
40 40 if @reading_group.update(reading_group_params)
  41 + @reading_group.attributes.update(public: attributes_params)
41 42 redirect_to(reading_group_path(@reading_group.id))
42 43 else
43 44 render "edit"
... ... @@ -67,11 +68,15 @@ class ReadingGroupsController &lt; ApplicationController
67 68 params[:reading_group][:name].strip!
68 69 params[:reading_group]
69 70 end
  71 +
  72 + def attributes_params
  73 + params[:attributes][:public] == "1"
  74 + end
70 75  
71 76 # Extracted code from create action
72 77 def create_and_redir(format)
73 78 if @reading_group.save
74   - current_user.reading_group_attributes.create reading_group_id: @reading_group.id
  79 + current_user.reading_group_attributes.create(reading_group_id: @reading_group.id, public: attributes_params)
75 80  
76 81 format.html { redirect_to reading_group_path(@reading_group.id), notice: t('successfully_created', :record => t(@reading_group.class)) }
77 82 format.json { render action: 'show', status: :created, location: @reading_group }
... ...