foreman_datacenter 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49cdb573f462e46ab86a64cd7b8915f0c09ff72e
-  data.tar.gz: 8944573b46fa5dfa2932be16d7c8586ae9907687
+  metadata.gz: c2040560c40bda84aa1b4284af8b9ad05914e71f
+  data.tar.gz: 8d9f8c59eea56fc83de9277d8bc9f2b5d1f2a862
 SHA512:
-  metadata.gz: c69e5748012abb678d68b200eca283cfd60825992cca16e7632cad172d20d228a5970e71787630752b4991b8d5480961e55410c05beabea829df7ec30c84b96a
-  data.tar.gz: a8193287b95f9c995546bb339c5e0f2f23f8dd7397c5f1ae170319ad5f1ab88e7a35580c25b3b81705275806a01f42eb96274cf262d702fe07b8deb95535a690
+  metadata.gz: f2f676d6354876392cc88ecdc9b0856b0a4d0153aad8e68c2965fa13baf7e74e8b36deb1ae5213227d14d6f8f82b7a4488f28140f21ff8bf481f80f43abc066c
+  data.tar.gz: 0b45cb353eda6b5c39318623b7d33f0c483f69580fd357d2235b85c379e01d888421ec41970ada91071c11b805c7d7fd8c78cbeb9a7501d92018001f8ce36bf3

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -1,6 +1,7 @@
 module ForemanDatacenter
   class CommentsController < ApplicationController
-    before_filter :load_resource, :load_commentable
+    before_filter :load_resource, :load_commentable, :load_current_user
+    before_filter :check_owner, only: [:edit]
 
     def new
       @comment = Comment.new
@@ -25,24 +26,46 @@ module ForemanDatacenter
       @comment = Comment.find(params[:id])
       @device = find_commentable(@comment)
       @submodule = parse_submodule(@comment)
-      if @comment.update(comment_params.merge(user_id: User.current.id))
-        process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}"
+      if @comment.user == @current_user
+        if @comment.update(comment_params)
+          process_success :success_redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}"
+        else
+          process_error :redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", :error_msg => _("Failed: %s") % (e)
+        end
       else
-        process_error :redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", :error_msg => _("Failed: %s") % (e)
+          process_error :redirect => "/datacenter/#{@submodule}/#{@comment.commentable_id}#comment-#{@comment.id}", :error_msg => _("You can edit only your own comments")
       end
     end
 
     def destroy
-      @comment = ForemanDatacenter::Comment.find(params[:id])
-      if @comment.destroy
-        process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
+      @comment = Comment.find(params[:id])
+      if @comment.user == @current_user
+        if @comment.destroy
+          process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
+        else
+          process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("Failed: %s") % (e)
+        end
       else
-        process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("Failed: %s") % (e)
+          process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("You can delete only your own comments")
       end
     end
 
     private
 
+    def load_current_user
+      @current_user = User.current
+    end
+
+    def check_owner
+      comment = Comment.find(params[:id])
+      commentable = comment.commentable_type.constantize.find(comment.commentable_id)
+      resource = parse_submodule(comment)
+      if comment.user != @current_user
+        process_error :redirect => (request.referrer || "/datacenter/#{resource}/#{commentable.id}" || root_path), :error_msg => _("You can edit only your own comments")
+        return
+      end
+    end
+
     def load_resource
       if (params[:resource] && params[:resource_id])
         @resource, @id = params[:resource], params[:resource_id]

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -30,7 +30,7 @@ module ForemanDatacenter
         console_ports: [:console_server_port],
         power_ports: [:power_outlet]
       ).find(params[:id])
-      @user = User.current
+      @current_user = User.current
       @commentable = @device
       @comment = Comment.new
     end
@@ -68,7 +68,7 @@ module ForemanDatacenter
 
     def destroy
       if @device.destroy
-        process_success object: @device
+        process_success success_redirect: "/datacenter/devices"
       else
         process_error object: @device
       end

data/app/views/foreman_datacenter/comments/_item.html.erb

@@ -1,15 +1,15 @@
 <strong id="comment-<%= comment.id %>">
   <small class="text-left pull-left">
+    Posted 
     <% if comment.user %>
-      Posted by <%= "#{comment.try(:user).try(:firstname)} #{comment.try(:user).try(:lastname)}" %> at <%= comment.updated_at %>
-  <% else %>
-      Posted at <%= comment.updated_at %>
-  <% end %>
-</small>
+      by <%= "#{comment.try(:user).try(:firstname)} #{comment.try(:user).try(:lastname)}" %>
+    <% end %>
+      at <%= comment.updated_at.to_formatted_s(:long_ordinal) %>
+  </small>
 
-<small class="text-right pull-right">
-  <%= link_to "##{comment.id}", "#comment-#{comment.id}" %>
-</small>
+  <small class="text-right pull-right">
+    <%= link_to "##{comment.id}", "#comment-#{comment.id}" %>
+  </small>
 </strong>
 <br/>
 <div class="text-left pull-left">
@@ -18,9 +18,11 @@
   <small>
     <%= link_to "Reply", new_comment_path(parent_id: comment.id, resource: commentable_data[:resource], resource_id: commentable_data[:id]) %>
     &nbsp;
-    <%= link_to "Edit", "/datacenter/comments/#{comment.id}/edit" %>
-    &nbsp;
-    <%= link_to "Delete", "/datacenter/#{commentable_data[:resource]}/#{commentable_data[:id]}/comments/#{comment.id}", method: :delete, data: {confirm: "Are you sure?"} %>
+    <% if @current_user == comment.user %>
+      <%= link_to "Edit", "/datacenter/comments/#{comment.id}/edit" %>
+      &nbsp;
+      <%= link_to "Delete", "/datacenter/#{commentable_data[:resource]}/#{commentable_data[:id]}/comments/#{comment.id}", method: :delete, data: {confirm: "Are you sure?"} %>
+    <% end %>
   </small>
 </div>
 <br/>

data/app/views/foreman_datacenter/devices/show.html.erb

@@ -17,7 +17,7 @@
     <div class="btn-toolbar pull-right">
       <%= link_to 'Edit', edit_device_path(@device), class: 'btn btn-warning' %>
       <%= link_to 'Delete', device_path(@device), class: 'btn btn-danger',
-                  action: :destroy, data: { confirm: 'Are you sure?' } %>
+                  method: :delete, data: { confirm: 'Are you sure?' } %>
       <%= link_to 'Import from hosts',
                   @device.host ?
                     edit_device_path(@device, host_id: @device.host.id) :

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.30'.freeze
+  VERSION = '0.1.31'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface