diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:18:00 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:18:00 -0400 |
| commit | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (patch) | |
| tree | b3d500e7072cb8edcae13d20a9999c65400d966b /app | |
| parent | 540980e84dc22e2064ad33f79c0b526628848fa9 (diff) | |
run generate
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/servers_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/servers/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/servers/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/servers/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/servers/show.html.erb | 5 | ||||
| -rw-r--r-- | app/views/servers/show.json.jbuilder | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index 43999c4..4c12c7e 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -69,6 +69,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params[:server] + params.require(:server).permit(:default_user_permissions) end end diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index b08654b..6211f9a 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -11,6 +11,10 @@ </div> <% end %> + <div class="field"> + <%= f.label :default_user_permissions %><br> + <%= f.number_field :default_user_permissions %> + </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb index f45d393..b3064f4 100644 --- a/app/views/servers/index.html.erb +++ b/app/views/servers/index.html.erb @@ -3,6 +3,7 @@ <table> <thead> <tr> + <th>Default user permissions</th> <th></th> <th></th> <th></th> @@ -12,6 +13,7 @@ <tbody> <% @servers.each do |server| %> <tr> + <td><%= server.default_user_permissions %></td> <td><%= link_to 'Show', server %></td> <td><%= link_to 'Edit', edit_server_path(server) %></td> <td><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %></td> diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder index 2776abc..3c9df60 100644 --- a/app/views/servers/index.json.jbuilder +++ b/app/views/servers/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@servers) do |server| - json.extract! server, :id + json.extract! server, :id, :default_user_permissions json.url server_url(server, format: :json) end diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 039cd8f..b18f09f 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -1,4 +1,9 @@ <p id="notice"><%= notice %></p> +<p> + <strong>Default user permissions:</strong> + <%= @server.default_user_permissions %> +</p> + <%= link_to 'Edit', edit_server_path(@server) %> | <%= link_to 'Back', servers_path %> diff --git a/app/views/servers/show.json.jbuilder b/app/views/servers/show.json.jbuilder index 972b1c0..c566f76 100644 --- a/app/views/servers/show.json.jbuilder +++ b/app/views/servers/show.json.jbuilder @@ -1 +1 @@ -json.extract! @server, :id, :created_at, :updated_at +json.extract! @server, :id, :default_user_permissions, :created_at, :updated_at |