Merge branch 'clean2'

Conflicts:
	app/views/servers/show.html.erb

6 files changed, 14 insertions, 3 deletions

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 6596dc6..27c6f9f 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -68,6 +68,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 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