Skip to content

Commit

Permalink
added admin functionality and some migration files
Browse files Browse the repository at this point in the history
  • Loading branch information
RedNoo committed Mar 22, 2017
1 parent ad91095 commit d2628cf
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 3 deletions.
6 changes: 4 additions & 2 deletions app/controllers/members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ class MembersController < ApplicationController

before_action :set_member, only:[:edit, :update, :show, :destroy]


def index
@members = Member.paginate(page: params[:page], per_page: 2)
end


def new
@member = Member.new
end
Expand All @@ -19,7 +19,7 @@ def create
@member = Member.new(member_params)
if @member.save
session[:member_id] = @member.id
flash[:success] = "Welcome toda CanDiTicket"
flash[:success] = "Welcome to the CanDiTicket"
redirect_to member_path(@member)
else
render :new
Expand Down Expand Up @@ -52,4 +52,6 @@ def set_member
def member_params
params.require(:member).permit(:email,:password)
end


end
8 changes: 8 additions & 0 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class UsersController < ApplicationController

before_action :set_user, only:[:edit, :update, :show, :destroy]
before_action :require_adminuser, only:[:new,:create, :destroy]

def index
@users = User.paginate(page: params[:page], per_page: 2)
Expand Down Expand Up @@ -52,4 +53,11 @@ def set_user
def user_params
params.require(:user).permit(:email,:password, :full_name)
end

def require_adminuser
if !current_user.admin?
flash[:danger] = "You need admin permissions"
redirect_to root_path
end
end
end
13 changes: 13 additions & 0 deletions db/migrate/20170322115821_create_process.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
class CreateProcess < ActiveRecord::Migration
def change
create_table :processes do |t|
t.text :description
t.integer :ticket_id
t.integer :user_id
t.integer :member_id

t.timestamps :created_at
t.timestamps :updated_at
end
end
end
5 changes: 5 additions & 0 deletions db/migrate/20170322120901_add_user_to_tickets.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddUserToTickets < ActiveRecord::Migration
def change
add_column :tickets, :user_id , :integer
end
end
5 changes: 5 additions & 0 deletions db/migrate/20170322124256_add_admin_to_users.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddAdminToUsers < ActiveRecord::Migration
def change
add_column :users, :admin , :boolean, default:false
end
end
13 changes: 12 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20170320221042) do
ActiveRecord::Schema.define(version: 20170322124256) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand All @@ -36,6 +36,15 @@
t.datetime "updated_at"
end

create_table "processes", force: :cascade do |t|
t.text "description"
t.integer "ticket_id"
t.integer "user_id"
t.integer "member_id"
t.datetime "created_at"
t.datetime "updated_at"
end

create_table "sla_plans", force: :cascade do |t|
t.string "title"
t.integer "responsetime"
Expand All @@ -55,6 +64,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.integer "member_id"
t.integer "user_id"
end

create_table "users", force: :cascade do |t|
Expand All @@ -63,6 +73,7 @@
t.string "password_digest"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "admin", default: false
end

end

0 comments on commit d2628cf

Please sign in to comment.