historiqueux 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa6f9d9801fa2574d312fa9cb6bc7f4f966f4bc
-  data.tar.gz: ebc4bdcfffa41ceaa805d1dd81b5b1a142208ea6
+  metadata.gz: 3205f29fed1f8568a080ad05aee5e597f8034153
+  data.tar.gz: 0d6746685370b07b4b26d21547b41bddc296db80
 SHA512:
-  metadata.gz: 3f1a2060b331a4b3b1b8af3bcd5bf367f71cacf189807c0321ce1a66f34ba780c113883229f3b9fd971b1b5ea9423a767a98e61eff9e61fc3476c5ee615f9f0c
-  data.tar.gz: 8e494d6a0ac76ee393f2caa67850acebc7ddc8a3650a77012eb10033365072f2b1eb93d1878992a338499705c49e5bef283c1a73277bc2872b965a9cc9c41eab
+  metadata.gz: d2979d162d406ef55388d7f8ceebfc327bfa7a5a1627ba9eb41b907308fd607bbdb90d0e37d6356a79e7ca705a68dfba85d73fb87ac62ca984558202a96bc891
+  data.tar.gz: b5db6b700e154fa6b5105f182612dd0ecf5a0644a223a4aed06ec62f9ca871acf065fbfb91f28c98850669c0ca8710be12a2b65f09c625417b1c5c373b556a22

data/app/controllers/historiqueux/history_controller.rb

@@ -30,7 +30,7 @@ module Historiqueux
 
         if @relation_resourceKlass
 
-          @relations = @relation_resourceKlass.reflect_on_all_associations.map { |r| "#{r.name}" }.reject { |i| i=='versions' }
+          @relations = @relation_resourceKlass.reflect_on_all_associations.map { |r| {:name => "#{r.name}", :parent => "#{r.active_record.to_s}"} }.reject { |i| i=='versions' }
 
           @history_relations = {}
           @relation_resource_list.each do |rr|

data/app/views/historiqueux/history/index_relations.html.erb

@@ -5,35 +5,39 @@
   <% @relation_resource_list.each_with_index do |relation_resource, idx| %>
 
       <div class="row">
+
         <div class="col-md-2">
           <h3><%= @relation_resource %> no <%= relation_resource.id %></h3>
         </div>
-        <div class="col-md-2">
 
-            <div>
-              <a role="button" id="toggler_relations<%= idx %>" href="#" data-toggle="collapse" class="btn btn-primary btn-xs" data-target="#relations_list<%= idx %>">
-                Relations
-              </a>
-            </div>
+        <% if @relations and @relations.size > 0 %>
 
-            <% if @relations %>
-                <div id="relations_list<%= idx %>" class="collapse">
-                  <% @relations.each do |relation| %>
-                      <ul class="nav nav-list">
+            <div class="col-md-2">
 
-                        <%= link_to relation, "#", :id => "#{relation}_open_relation#{idx}", :class => 'event_open_relation',
-                                    :data => {:parent => @parent_div,
-                                              :resource => @relation_resource,
-                                              :id => relation_resource.id,
-                                              :relation => relation} %>
+              <div>
+                <a role="button" id="toggler_relations<%= idx %>" href="#" data-toggle="collapse" class="btn btn-primary btn-xs" data-target="#relations_list<%= idx %>">
+                  Relations
+                </a>
+              </div>
 
+              <% if @relations %>
+                  <div id="relations_list<%= idx %>" class="collapse">
+                    <% @relations.each do |relation| %>
+                        <ul class="nav nav-list">
 
-                      </ul>
-                  <% end %>
-                </div>
-            <% end %>
-          </div>
+                          <%= link_to relation[:name], "#", :id => "#{relation[:name]}_open_relation#{idx}", :class => 'event_open_relation',
+                                      :data => {:parent => @parent_div,
+                                                :resource => relation[:parent],
+                                                :id => relation_resource.id,
+                                                :relation => relation[:name]} %>
+
+                        </ul>
+                    <% end %>
+                  </div>
+              <% end %>
+            </div>
 
+        <% end %>
 
       </div>
 
@@ -58,7 +62,7 @@
                       id="row<%= idx + 1 %>"
                       data-event-id="<%= event.id %>"
                       data-parent-div="<%= @parent_div %>"
-                      data-resource="<%= @relation_resource.downcase %>"
+                      data-resource="<%= event.item_type %>"
                       data-resource-id="<%= relation_resource.id %>">
 
                     <td>

data/lib/historiqueux/version.rb

@@ -1,3 +1,3 @@
 module Historiqueux
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: historiqueux
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Groupe Fungo inc.