do not show resource category when no categories present #30

- in form
- in list view

Author: jkraemer

app/controllers/asset_resource_items_controller.rb

@@ -1,6 +1,8 @@
 class AssetResourceItemsController < ResourceItemsController
   menu_item :asset_resource_items
 
+  private
+
   def resource_class
     Asset
   end

app/controllers/human_resource_items_controller.rb

@@ -1,6 +1,8 @@
 class HumanResourceItemsController < ResourceItemsController
   menu_item :human_resource_items
 
+  private
+
   def resource_class
     Human
   end

app/views/asset_resource_items/index.html.erb

@@ -1,3 +1,4 @@
+<% categories_present = ResourceCategory.for_assets.where(project: @project).any? %>
 <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' %>
@@ -10,15 +11,19 @@
   <table class="list resource_items">
     <thead>
       <tr>
+        <% if categories_present %>
         <th><%= l :label_resource_item_category %></th>
+        <% end %>
         <th><%= l :label_resource_item_name %></th>
         <th></th>
       </tr>
     </thead>
     <tbody>
       <% for i in @resource_items %>
         <tr>
+          <% if categories_present %>
           <td class="category"><%= i.category&.name %>
+          <% end %>
           <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>

app/views/human_resource_items/index.html.erb

@@ -1,3 +1,4 @@
+<% categories_present = ResourceCategory.for_humans.where(project: @project).any? %>
 <div class="contextual">
 <% if User.current.allowed_to? :manage_resource_items, @project %>
   <%= link_to l(:label_human_resource_item_new), new_project_human_resource_item_path(@project), class: 'icon icon-add' %>
@@ -10,15 +11,19 @@
   <table class="list resource_items">
     <thead>
       <tr>
+        <% if categories_present %>
         <th><%= l :label_resource_item_category %></th>
+        <% end %>
         <th><%= l :label_resource_item_name %></th>
         <th></th>
       </tr>
     </thead>
     <tbody>
       <% for i in @resource_items %>
         <tr>
+          <% if categories_present %>
           <td class="category"><%= i.category&.name %>
+          <% end %>
           <td class="name"><%= link_to i.name, edit_project_human_resource_item_path(@project, i) %></td>
           <td><%= delete_link project_human_resource_item_path(@project, i) %></td>
         </tr>

app/views/resource_items/_form.html.erb

@@ -2,7 +2,9 @@
 
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
-  <p><%= f.select :category_id, categories.sorted.map{|c|[c.name, c.id]}, label: l(:field_resource_category), include_blank: true %></p>
+  <% if categories.any? %>
+    <p><%= f.select :category_id, categories.sorted.map{|c|[c.name, c.id]}, label: l(:field_resource_category), include_blank: true %></p>
+  <% end %>
 </div>