From d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:18:00 -0400 Subject: run generate --- app/controllers/servers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/servers_controller.rb') 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 -- cgit v1.2.3-54-g00ecf From a81c1ca571b0bb41f0acba6594559c7405fc2bb1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:58:00 -0400 Subject: Simplify the server controller and views, as it is a singular resource --- app/controllers/servers_controller.rb | 51 +++++------------------------------ app/views/servers/index.html.erb | 27 ------------------- app/views/servers/index.json.jbuilder | 4 --- app/views/servers/new.html.erb | 5 ---- 4 files changed, 7 insertions(+), 80 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/controllers/servers_controller.rb') diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index 27c6f9f..e3850b8 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -1,43 +1,15 @@ class ServersController < ApplicationController - - # GET /servers - # GET /servers.json - def index - @servers = Server.all - end - - # GET /servers/1 - # GET /servers/1.json + # GET /server + # GET /server.json def show end - # GET /servers/new - def new - @server = Server.new - end - - # GET /servers/1/edit + # GET /server/edit def edit end - # POST /servers - # POST /servers.json - def create - @server = Server.new(server_params) - - respond_to do |format| - if @server.save - format.html { redirect_to @server, notice: 'Server was successfully created.' } - format.json { render action: 'show', status: :created, location: @server } - else - format.html { render action: 'new' } - format.json { render json: @server.errors, status: :unprocessable_entity } - end - end - end - - # PATCH/PUT /servers/1 - # PATCH/PUT /servers/1.json + # PATCH/PUT /server + # PATCH/PUT /server.json def update respond_to do |format| if @server.update(server_params) @@ -50,20 +22,11 @@ class ServersController < ApplicationController end end - # DELETE /servers/1 - # DELETE /servers/1.json - def destroy - @server.destroy - respond_to do |format| - format.html { redirect_to servers_url } - format.json { head :no_content } - end - end - private + # Use callbacks to share common setup or constraints between actions. def set_server - @server = Server.find(params[:id]) + @server = Server.first end # Never trust parameters from the scary internet, only allow the white list through. 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 @@ -

Listing servers

- - - - - - - - - - - - - <% @servers.each do |server| %> - - - - - - - <% end %> - -
Default user permissions
<%= server.default_user_permissions %><%= link_to 'Show', server %><%= link_to 'Edit', edit_server_path(server) %><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- -<%= 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 @@ -

New server

- -<%= render 'form' %> - -<%= link_to 'Back', servers_path %> -- cgit v1.2.3-54-g00ecf From cfaff7870d0348b25b3b4b2597950894ab25d989 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:32:38 -0400 Subject: implement editing the default user permissions --- app/controllers/servers_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/models/server.rb | 36 +++++++++++++++++++++++++++++++++++ app/views/servers/_form.html.erb | 23 ++++++++++------------ app/views/servers/edit.html.erb | 2 +- app/views/servers/show.html.erb | 2 +- 6 files changed, 50 insertions(+), 17 deletions(-) (limited to 'app/controllers/servers_controller.rb') diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index e3850b8..83a9f31 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -31,6 +31,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params.require(:server).permit(:default_user_permissions) + params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dd66c18..637480f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,7 @@ class UsersController < ApplicationController return end - @user.permissions = 0 + @user.permissions = Server.first.default_user_permissions respond_to do |format| if @user.save sign_in @user diff --git a/app/models/server.rb b/app/models/server.rb index 120f0fa..5ba7524 100644 --- a/app/models/server.rb +++ b/app/models/server.rb @@ -1,2 +1,38 @@ class Server < ActiveRecord::Base + def default_user_abilities + @abilities ||= User::Abilities.new(DefaultUser.new(self)) + end + def default_user_abilities=(new) + new.each do |k,v| + if v == "0" + v = false + end + default_user_abilities[k] = v + end + end + class DefaultUser + def initialize(server) + @server = server + end + def can?(action) + bit = User.permission_bits[action] + if bit.nil? + return false + else + return (@server.default_user_permissions & bit != 0) + end + end + def add_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions |= bit + end + end + def remove_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions &= ~ bit + end + end + end end 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? %> -
-

<%= pluralize(@server.errors.count, "error") %> prohibited this server from being saved:

+ <%= render "common/error_messages", :target => @server %> -
    - <% @server.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • +
    + Default permissions for new users +
      + <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %> + <% @server.default_user_abilities.keys.each do |ability| %> +
      • <% end %> -
    -
- <% end %> + <% end %> + + -
- <%= f.label :default_user_permissions %>
- <%= f.number_field :default_user_permissions %> -
<%= f.submit %>
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 %>

-<%= link_to 'Edit', edit_server_path(@server) %> +<%= link_to 'Edit', edit_server_path %> -- cgit v1.2.3-54-g00ecf