diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
commit | 82840d22116835474614b80ebe72c282bcfc5f5e (patch) | |
tree | ea24c3648274c664ba014f28356ae353d049b643 /app/views | |
parent | 0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff) | |
parent | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff) |
Merge branch 'clean2'
Conflicts:
app/views/servers/show.html.erb
Diffstat (limited to 'app/views')
-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 |
5 files changed, 13 insertions, 2 deletions
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 67f7647..aa6752a 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -1,2 +1,7 @@ +<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 |