From d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 13:18:00 -0400
Subject: run generate

---
 app/views/servers/_form.html.erb      | 4 ++++
 app/views/servers/index.html.erb      | 2 ++
 app/views/servers/index.json.jbuilder | 2 +-
 app/views/servers/show.html.erb       | 5 +++++
 app/views/servers/show.json.jbuilder  | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'app/views/servers')

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
-- 
cgit v1.2.3-2-g168b


From a81c1ca571b0bb41f0acba6594559c7405fc2bb1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 13:58:00 -0400
Subject: Simplify the server controller and views, as it is a singular
 resource

---
 app/views/servers/index.html.erb      | 27 ---------------------------
 app/views/servers/index.json.jbuilder |  4 ----
 app/views/servers/new.html.erb        |  5 -----
 3 files changed, 36 deletions(-)
 delete mode 100644 app/views/servers/index.html.erb
 delete mode 100644 app/views/servers/index.json.jbuilder
 delete mode 100644 app/views/servers/new.html.erb

(limited to 'app/views/servers')

diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb
deleted file mode 100644
index b3064f4..0000000
--- a/app/views/servers/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing servers</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Default user permissions</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <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>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Server', new_server_path %>
diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder
deleted file mode 100644
index 3c9df60..0000000
--- a/app/views/servers/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@servers) do |server|
-  json.extract! server, :id, :default_user_permissions
-  json.url server_url(server, format: :json)
-end
diff --git a/app/views/servers/new.html.erb b/app/views/servers/new.html.erb
deleted file mode 100644
index 0422009..0000000
--- a/app/views/servers/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New server</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', servers_path %>
-- 
cgit v1.2.3-2-g168b


From 2da3c10d18856c254457a3106eb8f1762b5077a9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 14:04:21 -0400
Subject: oops

---
 app/views/servers/edit.html.erb | 3 +--
 app/views/servers/show.html.erb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/views/servers')

diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb
index a92cdb5..99f7faa 100644
--- a/app/views/servers/edit.html.erb
+++ b/app/views/servers/edit.html.erb
@@ -2,5 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @server %> |
-<%= link_to 'Back', servers_path %>
+<%= link_to 'Show', @server %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index aa6752a..875be5d 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -3,5 +3,4 @@
   <%= @server.default_user_permissions %>
 </p>
 
-<%= link_to 'Edit', edit_server_path(@server) %> |
-<%= link_to 'Back', servers_path %>
+<%= link_to 'Edit', edit_server_path(@server) %>
-- 
cgit v1.2.3-2-g168b


From cfaff7870d0348b25b3b4b2597950894ab25d989 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sun, 6 Apr 2014 14:32:38 -0400
Subject: implement editing the default user permissions

---
 app/views/servers/_form.html.erb | 23 ++++++++++-------------
 app/views/servers/edit.html.erb  |  2 +-
 app/views/servers/show.html.erb  |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'app/views/servers')

diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index 6211f9a..1afde11 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -1,20 +1,17 @@
 <%= form_for(@server) do |f| %>
-  <% if @server.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@server.errors.count, "error") %> prohibited this server from being saved:</h2>
+  <%= render "common/error_messages", :target => @server %>
 
-      <ul>
-      <% @server.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
+  <fieldset>
+    <legend>Default permissions for new users</legend>
+    <ul>
+      <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %>
+      <% @server.default_user_abilities.keys.each do |ability| %>
+      <li><label><%= a.check_box(ability) %> <%= ability.to_s.humanize %></label></li>
       <% end %>
-      </ul>
-    </div>
-  <% end %>
+    <% end %>
+    </ul>
+  </fieldset>
 
-  <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/edit.html.erb b/app/views/servers/edit.html.erb
index 99f7faa..d37864f 100644
--- a/app/views/servers/edit.html.erb
+++ b/app/views/servers/edit.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @server %>
+<%= link_to server_path %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
index 875be5d..54aaf66 100644
--- a/app/views/servers/show.html.erb
+++ b/app/views/servers/show.html.erb
@@ -3,4 +3,4 @@
   <%= @server.default_user_permissions %>
 </p>
 
-<%= link_to 'Edit', edit_server_path(@server) %>
+<%= link_to 'Edit', edit_server_path %>
-- 
cgit v1.2.3-2-g168b