splits resources items into people and assets #26 #24

Author: jkraemer

app/controllers/asset_resource_items_controller.rb

@@ -0,0 +1,12 @@
+class AssetResourceItemsController < ResourceItemsController
+  menu_item :asset_resource_items
+
+  def resource_class
+    Asset
+  end
+
+  def redirect_to_index
+    redirect_to project_asset_resource_items_path @project
+  end
+end
+

app/controllers/human_resource_items_controller.rb

@@ -0,0 +1,11 @@
+class HumanResourceItemsController < ResourceItemsController
+  menu_item :human_resource_items
+
+  def resource_class
+    Human
+  end
+
+  def redirect_to_index
+    redirect_to project_human_resource_items_path @project
+  end
+end

app/controllers/issue_resource_items_controller.rb

@@ -7,11 +7,12 @@ class IssueResourceItemsController < ApplicationController
 
   def new
     @categories = @project.resource_categories.sorted
-    @category = @categories.first
     @issue = find_issue_if_present
+    @type = %w(Asset Human).detect{|t| t == params[:type]}
 
     query = RedmineResourceManager::ResourceItemsQuery.new(
-      project: @project, category_id: @category.id, issue_id: params[:issue_id]
+      project: @project, category_id: nil, issue_id: params[:issue_id],
+      resource_class: @type.constantize
     )
 
     @resource_items = query.scope

app/controllers/resource_items_controller.rb

@@ -4,33 +4,34 @@ class ResourceItemsController < ApplicationController
   before_action :find_project_by_project_id
   before_action :authorize
 
-  menu_item :resource_items
 
   def index
-    @resource_items = @project.resource_items
-      .joins(:category)
-      .order("#{ResourceCategory.table_name}.name ASC, #{ResourceItem.table_name} ASC")
+    @resource_items = resource_class.where(project_id: @project.id)
+      .includes(:category).references(:category)
+      .order("#{ResourceCategory.table_name}.name ASC, #{ResourceItem.table_name}.name ASC")
   end
 
   def edit
     @resource_item = find_resource_item
   end
 
   def new
-    @resource_item = ResourceItem.new resource_item_params
+    @resource_item = resource_class.new resource_item_params
   end
 
   def create
     r = RedmineResourceManager::SaveResourceItem.(
-      resource_item_params, project: @project
+      resource_item_params, project: @project, resource_class: resource_class
     )
     if r.item_saved?
-      redirect_to params[:continue] ?
-        new_project_resource_item_path(
+      if params[:continue]
+        redirect_to new_project_resource_item_path(
           @project,
           resource_item: { category_id: r.item.category_id }
-        ) :
-        project_resource_items_path(@project)
+        )
+      else
+        redirect_to_index
+      end
     else
       @resource_item = r.item
       render 'new'
@@ -43,37 +44,46 @@ def update
       resource_item_params, item: @resource_item, project: @project
     )
     if r.item_saved?
-      redirect_to project_resource_items_path @project
+      redirect_to_index
     else
       render 'edit'
     end
   end
 
   def destroy
     find_resource_item.destroy
-    redirect_to project_resource_items_path @project
+    redirect_to_index
   end
 
   def autocomplete
     query = RedmineResourceManager::ResourceItemsQuery.new(
+      resource_class: resource_class,
       project: @project,
       category_id: params[:category_id],
       query: params[:q],
-      issue_id: params[:issue_id]
+      issue_id: params[:issue_id],
     )
     @resource_items = query.scope
     @total = query.total
-    render layout: false
+    render 'resource_items/autocomplete', layout: false
   end
 
   private
 
+  def resource_class
+    if type = %w(Asset Human).detect{|t|t == params[:type]}
+      type.constantize
+    end
+  end
+
   def resource_item_params
-    params[:resource_item].permit :name, :category_id if params[:resource_item]
+    if parameters = params[:human] || params[:asset]
+      parameters.permit :name, :category_id
+    end
   end
 
   def find_resource_item
-    @project.resource_items.find params[:id]
+    resource_class.where(project_id: @project.id).find params[:id]
   end
 
 end

app/models/asset.rb

@@ -0,0 +1,3 @@
+class Asset < ResourceItem
+end
+

app/models/human.rb

@@ -0,0 +1,3 @@
+class Human < ResourceItem
+end
+

app/models/resource_item.rb

@@ -1,8 +1,11 @@
 class ResourceItem < ActiveRecord::Base
+  belongs_to :project
   belongs_to :category, class_name: 'ResourceCategory'
+
   has_many :issue_resource_items
 
-  validates :category_id, presence: true
+  validates :project_id, presence: true
+  #validates :category_id, presence: true
   validates :name, presence: true,
                    uniqueness: { case_sensitive: false, scope: :category_id }
 

app/views/asset_resource_items/edit.html.erb

@@ -0,0 +1,11 @@
+<%= title [l(:label_asset_resource_item_plural), project_asset_resource_items_path(@project)], @resource_item.name %>
+
+<%= labelled_form_for @resource_item, url: project_asset_resource_item_path(@project, @resource_item), method: :patch do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <p>
+    <%= submit_tag l :button_save %>
+  </p>
+<% end %>
+
+
+

app/views/asset_resource_items/index.html.erb

@@ -0,0 +1,31 @@
+<div class="contextual">
+<% if User.current.allowed_to? :manage_resource_items, @project %>
+  <%= link_to l(:label_asset_resource_item_new), new_project_asset_resource_item_path(@project), class: 'icon icon-add' %>
+<% end %>
+</div>
+
+<h2><%= l :label_asset_resource_item_plural %></h2>
+
+<% if @resource_items.any? %>
+  <table class="list resource_items">
+    <thead>
+      <tr>
+        <th><%= l :label_resource_item_category %></th>
+        <th><%= l :label_resource_item_name %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% for i in @resource_items %>
+        <tr>
+          <td class="category"><%= i.category&.name %>
+          <td class="name"><%= link_to i.name, edit_project_asset_resource_item_path(@project, i) %></td>
+          <td><%= delete_link project_asset_resource_item_path(@project, i) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p class="nodata"><%= l :label_no_data %></p>
+<% end %>
+

app/views/asset_resource_items/new.html.erb

@@ -0,0 +1,11 @@
+<%= title [l(:label_asset_resource_item_plural), project_asset_resource_items_path(@project)], l(:label_asset_resource_item_new) %>
+
+<%= labelled_form_for @resource_item, url: project_asset_resource_items_path(@project) do |f| %>
+  <%= render partial: 'resource_items/form', locals: { f: f } %>
+  <p>
+    <%= submit_tag l :button_create %>
+    <%= submit_tag l(:button_create_and_continue), name: 'continue' %>
+  </p>
+<% end %>
+
+