Refine permissions and style
This commit is contained in:
parent
ced73753d8
commit
1090be55be
@ -16,6 +16,7 @@ class RoomsController < ApplicationController
|
|||||||
@rooms = Room.public_rooms
|
@rooms = Room.public_rooms
|
||||||
@message = Message.new
|
@message = Message.new
|
||||||
@messages = @room.messages
|
@messages = @room.messages
|
||||||
|
@new_room = Room.new
|
||||||
|
|
||||||
render "index"
|
render "index"
|
||||||
end
|
end
|
||||||
|
|||||||
@ -35,22 +35,22 @@ class MessagePolicy
|
|||||||
end
|
end
|
||||||
|
|
||||||
def new?
|
def new?
|
||||||
@user.admin?
|
@user.signed_in?
|
||||||
end
|
end
|
||||||
|
|
||||||
def create?
|
def create?
|
||||||
@user.admin?
|
@user.signed_in?
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit?
|
def edit?
|
||||||
@user.admin?
|
@user.admin? || @user == @message.user
|
||||||
end
|
end
|
||||||
|
|
||||||
def update?
|
def update?
|
||||||
@user.admin?
|
@user.admin? || @user == @message.user
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy?
|
def destroy?
|
||||||
@user.admin?
|
@user.admin? || @user == @message.user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -35,22 +35,22 @@ class RoomPolicy
|
|||||||
end
|
end
|
||||||
|
|
||||||
def new?
|
def new?
|
||||||
@user.admin?
|
@user.admin? || @user.signed_in?
|
||||||
end
|
end
|
||||||
|
|
||||||
def create?
|
def create?
|
||||||
@user.admin?
|
@user.admin? || @user.signed_in?
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit?
|
def edit?
|
||||||
@user.admin?
|
@user.admin? || @user == @room.user
|
||||||
end
|
end
|
||||||
|
|
||||||
def update?
|
def update?
|
||||||
@user.admin?
|
@user.admin? || @user == @room.user
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy?
|
def destroy?
|
||||||
@user.admin?
|
@user.admin? || @user == @room.user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -14,6 +14,9 @@
|
|||||||
<% if policy(:table).index? %>
|
<% if policy(:table).index? %>
|
||||||
<li><%= link_to 'Tables', tables_path %></li>
|
<li><%= link_to 'Tables', tables_path %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if policy(:room).index? %>
|
||||||
|
<li><%= link_to 'Chat', rooms_path %></li>
|
||||||
|
<% end %>
|
||||||
<% if current_user.signed_in? %>
|
<% if current_user.signed_in? %>
|
||||||
<% if current_user.admin? %>
|
<% if current_user.admin? %>
|
||||||
<li><%= link_to 'Users', users_path %></li>
|
<li><%= link_to 'Users', users_path %></li>
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
= form_with(model: @new_room, remote: true) do |f|
|
= form_with(model: @new_room, remote: true, url: rooms_path) do |f|
|
||||||
= f.text_field :name, class: "form-control", autocomplete: 'off'
|
= f.text_field :name, class: "form-control", autocomplete: 'off'
|
||||||
= f.submit data: { disable_with: false }
|
= f.submit data: { disable_with: false }
|
||||||
|
|||||||
@ -5,7 +5,11 @@
|
|||||||
.contain
|
.contain
|
||||||
#messages
|
#messages
|
||||||
= render @messages
|
= render @messages
|
||||||
= render partial: 'layouts/new_message_form'
|
- if current_user.signed_in?
|
||||||
|
= render partial: 'layouts/new_message_form'
|
||||||
|
- else
|
||||||
|
= link_to "Sign in", new_session_path(current_user)
|
||||||
|
to join the chat
|
||||||
|
|
||||||
%h1 Rooms index
|
%h1 Rooms index
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user