foreman_datacenter 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a10f0c7efa0d822edda97c4f26f2bffd289e13
-  data.tar.gz: 21bd60d5f30ffea8a219f568fb1f1d4c7b58e125
+  metadata.gz: 830571f1589958041b0aaa9dec1bf8304b5c841c
+  data.tar.gz: 0bd0a890f73397ccbb390f15843fdf6b5bbd50ad
 SHA512:
-  metadata.gz: 1a5b68f299357f2f72fad9731ae2a178a238b6d2440a8b85b4950e97a7add05ecf2023bd87b2444e3e94fd1ad5a43bf817c48eab0ec846679120b316e650db6f
-  data.tar.gz: 00c7bdbaa133a41a519bd31adeb5188f752045a4ea867b6f5fc578e6991b521e6ad7987b2ab694fd443b9be2f2e0cd6eeb0a804ba3dd4f9ce3cb7436b8824086
+  metadata.gz: 6ebe444b3ad488c5f06ec03ee38fc51d90433f2522beeff517f8c3922bd4fdfd6c9616b894601130a9fce24f309913d4d9bf3323a377643932f711111ed5ac97
+  data.tar.gz: 52471ce0703b8f63641380dacb524d8a3e5e1f9c09f34d1272cbcae2eb43f52e1a01b5cb8fee4ef567b2581ff5be2fe82ef956e708d74a8ee876b224b9552f3a

data/app/controllers/foreman_datacenter/comments_controller.rb

@@ -1,31 +1,62 @@
 module ForemanDatacenter
   class CommentsController < ApplicationController
-    before_filter :load_commentable
-
-    def index
-      @comments = @commentable.comments
-    end
-
-    def new
-    end
+    before_filter :load_resource, :load_commentable
 
     def edit
+      @comment = Comment.find(params[:id])
     end
 
     def create
+      @comment = @commentable.comments.new(comment_params)
+      if @comment.save
+        process_success :success_redirect => "/datacenter/#{@resource}/#{@id}#comment-#{@comment.id}"
+      else
+        process_error :redirect => "/datacenter/#{@resource}/#{@id}", :error_msg => _("Failed: %s") % (e)
+      end
     end
 
     def update
+      @comment = Comment.find(params[:id])
+      @device = find_commentable(@comment)
+      @submodule = parse_submodule(@comment)
+      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
     end
 
     def destroy
+      @comment = ForemanDatacenter::Comment.find(params[:id])
+      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
     end
 
     private
+
+    def load_resource
+      @resource, @id = request.path.split('/')[2, 3]
+    end
+
     def load_commentable
-      resource, id = request.path.split('/')[2, 3]
-      @commentable = "foreman_datacenter::#{resource.capitalize}".singularize.classify.constantize.find(id)
+      @commentable = "foreman_datacenter::#{@resource.capitalize}".singularize.classify.constantize.find(@id.to_i)
+    end
+
+    def comment_params
+      params[:foreman_datacenter_comment].permit(:content, :commntable_type, :commentable_id)
+    end
+
+    def find_commentable(comment)
+      comment.commentable_type.classify.constantize.find(comment.commentable_id)
+    end
+
+    def parse_submodule(comment)
+      comment.commentable_type.gsub("ForemanDatacenter::", "").pluralize.downcase
     end
 
   end
 end
+

data/app/controllers/foreman_datacenter/devices_controller.rb

@@ -9,6 +9,8 @@ module ForemanDatacenter
     before_action :set_device, only: [:update, :destroy, :inventory,
                                       :destroy_interfaces, :qr_code]
 
+    before_action :load_resource
+
     def index
       begin
         search = resource_base.search_for(params[:search], :order => params[:order])
@@ -28,6 +30,9 @@ module ForemanDatacenter
         console_ports: [:console_server_port],
         power_ports: [:power_outlet]
       ).find(params[:id])
+      @user = User.current
+      @commentable = @device
+      @comment = Comment.new
     end
 
     def inventory
@@ -106,10 +111,14 @@ module ForemanDatacenter
     def device_params
       params[:device].permit(:device_type_id, :device_role_id, :platform_id,
                              :name, :serial, :rack_id, :position, :side,
-                             :face, :status, :primary_ip4, :primary_ip6, :comments,
+                             :face, :status, :primary_ip4, :primary_ip6,
                              :host_id, :size)
     end
 
+    def load_resource
+      @resource, @id = request.path.split('/')[2, 3]
+    end
+
     def populate_from_host
       if params[:host_id]
         host = Host.find(params[:host_id])

data/app/models/foreman_datacenter/device.rb

@@ -29,7 +29,7 @@ module ForemanDatacenter
     has_one :site, :through => :rack
 
     has_many :comments, :class_name => 'ForemanDatacenter::Comment',
-             dependent: :destroy
+             dependent: :destroy, as: :commentable
 
     enum face: [:front, :rear]
     enum side: [:left, :right, :full]

data/app/models/foreman_datacenter/rack.rb

@@ -24,7 +24,7 @@ module ForemanDatacenter
       i = 1
       loop do
 	current_device = devs.select{ |d| d[0].include?(i) }
-	current_device == [] ? (result << [[i],[]]; i +=1 ) : (result << current_device[0]; i = current_device[0][0].last + 1)
+	current_device == [] ? (result << [[i],[]]; i +=1 ) : (result << merge_devices(current_device, i); i = i + current_device[0][1].last.size)
 	break if i > height
       end
       device_sorting(result)
@@ -33,7 +33,13 @@ module ForemanDatacenter
     private
 
     def device_sorting(devices)
-      devices.reverse.map { |d| [d[0].reverese, d[1]] }
+      devices.reverse.map { |d| [d[0].reverse, d[1]] }
     end
+
+    def merge_devices(devices, position)
+       devs = [[position],[]]
+       devices.each{|d| devs[1] << d[1][0]}
+       return devs
+     end
   end
 end

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

@@ -0,0 +1,24 @@
+<% if action_name == "edit" %>
+  <%= form_for @comment, url: "/datacenter/comments/#{@comment.id}" do |f| %>
+    <div class="clearfix">
+      <div class="form-group">
+        <div class="col-md-5">
+          <%= f.text_area :content, rows: 8, class: "form-control" %>
+        </div>
+      </div>
+    </div>
+    <%= f.submit "Edit comment", class: "btn btn-primary remove_form_templates" %>
+  <% end %>
+<% else %>
+  <%= form_for [@commentable, @comment], url: "/datacenter/devices/#{@commentable.id}/comments" do |f| %>
+    <div class="clearfix">
+      <div class="form-group">
+        <div class="col-md-5">
+          <%= f.text_area :content, rows: 8, class: "form-control" %>
+        </div>
+      </div>
+    </div>
+    <%= f.submit "Add comment", class: "btn btn-primary remove_form_templates" %>
+  <% end %>
+<% end %>
+

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

@@ -1,3 +1,4 @@
-<h1>Comments#edit</h1>
-<p>Find me in app/views/comments/edit.html.erb</p>
+<% title 'Editing a comment' %>
+
+<%= render 'form' %>
 

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

@@ -72,14 +72,6 @@
       </div>
     </div>
 
-    <!-- Comments -->
-    <div class="panel panel-default">
-      <div class="panel-heading"><strong>Comments</strong></div>
-      <div class="panel-body">
-        <%= textarea_f f, :comments, rows: 10 %>
-      </div>
-    </div>
-
     <%= f.hidden_field :host_id %>
 
     <%= submit_or_cancel f %>

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

@@ -389,5 +389,34 @@
           </div>
         </div>
     <% end %>
+
+   <!-- Comments -->
+    <div class="panel panel-default">
+      <div class="panel-heading"><strong>Comments</strong></div>
+      <table class="table table-hover panel-body table-striped">
+        <tbody>
+          <% @device.comments.each do |c| %>
+            <tr>
+              <td>
+                <!-- <div id="comment-<%#= c.id %>"></div> -->
+                <div class="text-left pull-left" id="comment-<%= c.id %>">
+                  <strong><small>Updated by ... <%#= "#{@user.firstname} #{@user.lastname}" %> at <%= c.updated_at %></small></strong>
+                  <br/>
+                  <%= c.content %>
+                </div>
+                <div class="text-right pull-right">
+                  <%= link_to "##{c.id}", "#comment-#{c.id}" %>
+                  <%= link_to "Delete", "/datacenter/#{@resource}/#{@id}/comments/#{c.id}", method: :delete, data: {confirm: "Are you sure?"} %>
+                  <%= link_to "Edit", "/datacenter/comments/#{c.id}/edit" %>
+                </div>
+                <br/>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= render 'foreman_datacenter/comments/form' %>
+    </div>
+
   </div>
 </div>

data/config/routes.rb

@@ -5,6 +5,7 @@ Foreman::Application.routes.draw do
       as: 'import_to_device'
 
   scope 'datacenter', module: :foreman_datacenter do
+    resources :comments, only: [:edit, :update]
     resources :sites
     resources :racks do
       get :rack_groups, on: :collection
@@ -83,7 +84,7 @@ Foreman::Application.routes.draw do
       resources :management_devices, only: [:new, :create, :edit, :update, :destroy],
                 shallow: true
 
-      resources :comments, except: [:show]
+      resources :comments, only: [:create, :destroy]
     end
     resources :device_interface_connections, only: [:index], path: 'connections' do
       get :interfaces, on: :collection

data/lib/foreman_datacenter/version.rb

@@ -1,3 +1,3 @@
 module ForemanDatacenter
-  VERSION = '0.1.23'.freeze
+  VERSION = '0.1.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_datacenter
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Pavel Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -176,9 +176,8 @@ files:
 - app/models/foreman_datacenter/rack.rb
 - app/models/foreman_datacenter/rack_group.rb
 - app/models/foreman_datacenter/site.rb
+- app/views/foreman_datacenter/comments/_form.html.erb
 - app/views/foreman_datacenter/comments/edit.html.erb
-- app/views/foreman_datacenter/comments/index.html.erb
-- app/views/foreman_datacenter/comments/new.html.erb
 - app/views/foreman_datacenter/console_port_templates/_form.html.erb
 - app/views/foreman_datacenter/console_port_templates/new.html.erb
 - app/views/foreman_datacenter/console_ports/_for_device.html.erb

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

@@ -1,9 +0,0 @@
-<h1>Comments for device <%= @commentable_type %> #<%= @commentable.id %></h1>
-
-<% @comments.each do |c| %>
-  <%= c.content %>
-  </br>
-  </hr>
-<% end %>
-
-

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

@@ -1,2 +0,0 @@
-<h1>Comments#new</h1>
-<p>Find me in app/views/comments/new.html.erb</p>