active_scaffold 3.4.22 → 3.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3c5d2bad80f3ddbf5610ba433594ce55fc3373
-  data.tar.gz: a37268b8a8c4633e5324154e9c764ace3feecb94
+  metadata.gz: f7165870ea614c4b6716d2e3471179817ddff211
+  data.tar.gz: d8cf35a1036360fc2f78e061b1f1e34d54b4449f
 SHA512:
-  metadata.gz: b05685d5fbbe603c317c6b01f5d2b6af1ba7fb44b8e246d6b2ac54675699d08f4263c529ed36042ba8135990b377b340b98371040bb3ebbde270db7f70651650
-  data.tar.gz: 838826402a406aada754ab436857ba53b3c4026a00466417d64970f9a52057154083bf006643d7e302b8db6f7891e0c101aba7b7fc477778c89b709a067ac9f1
+  metadata.gz: 85707d87e834e46b05a286db1dd795980c9329c53563d28238a69e459a72a7825d2faf78ff55898d0cf58b4180932d5cd4eafba81c9ca62a743e5ea23d0a3884
+  data.tar.gz: 262c83c84c084418072a6706d9db22b0f9d04d93b5fa6fa4be552b386663ffd18f2c3b2ca252cf039f2e302ea7fc4c5c0d44ba954d9d63bab349d6a2deebb70b

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.4.23
+- fix chosen on new subform rows
+- add show_ui to column
+- add :vertical and :horizontal show_ui for associations
+
 = 3.4.22
 - fix has_one/many tableless model through association
 - fix check default value for checkboxes, so if record in subform, with checkbox, is left as default, is not saved, but setting checkbox would save record

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Richard White
+Copyright (c) 2006-2015 Richard White, Sergio Cambra and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/jquery/active_scaffold_chosen.js

@@ -1,5 +1,5 @@
 jQuery(document).ready(function() {
-  jQuery(document).on('as:element_updated', function(event) {
+  jQuery(document).on('as:element_updated as:element_created', function(event) {
     jQuery('select.chosen', event.target).chosen();
   });
   jQuery(document).on('as:action_success', 'a.as_action', function(event, action_link) {

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -130,7 +130,8 @@ background-color: $column_header_bg;
 color: $column_header_link_color;
 }
 
-.active-scaffold th p {
+.active-scaffold th p,
+.active-scaffold .show-view th {
 color: $column_header_color;
 }
 

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -149,8 +149,12 @@ text-align: left;
 }
 
 .active-scaffold th a,
-.active-scaffold th p {
+.active-scaffold th p,
+.active-scaffold .show-view th {
 font: bold 11px arial, sans-serif;
+}
+.active-scaffold th a,
+.active-scaffold th p {
 display: block;
 }
 
@@ -158,7 +162,8 @@ display: block;
 padding: 2px 2px 2px 5px;
 }
 
-.active-scaffold th p {
+.active-scaffold th p,
+.active-scaffold .show-view th {
 padding: 2px 5px;
 }
 
@@ -183,8 +188,11 @@ display: none;
 /* Table :: Record Rows
    ============================= */
 
-.active-scaffold tr.record td {
+.active-scaffold tr.record td,
+.active-scaffold .show-view td {
 padding: 5px 4px;
+}
+.active-scaffold tr.record td {
 font-family: Verdana, sans-serif;
 font-size: 11px;
 border: solid 1px;
@@ -555,6 +563,16 @@ margin-left: 5px;
 }
 .active-scaffold .show-view dl dl {
 margin-left: 0px;
+margin-top: 5px;
+}
+.active-scaffold .show-view dl dl:first-child {
+margin-top: 0;
+}
+.active-scaffold .show-view dl dl:after {
+display: block;
+content: "";
+height: 1px;
+clear: both;
 }
 
 .active-scaffold .show-view dt {

data/app/views/active_scaffold_overrides/_show.html.erb

@@ -1,6 +1,6 @@
 <h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : h(@record.to_label)) %></h4>
 
-<%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>
+<%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns, :record => @record} -%>
 
 <p class="form-footer">
   <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr? %>

data/app/views/active_scaffold_overrides/_show_association.html.erb

@@ -0,0 +1,2 @@
+<% associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a -%>
+<%= render :partial => "show_association_#{show_partial}", :locals => {:column => column, :parent_record => parent_record, :associated => associated} if associated.present? %>

data/app/views/active_scaffold_overrides/_show_association_horizontal.html.erb

@@ -0,0 +1,17 @@
+<%
+  columns_hash = {}
+%>
+<table>
+  <thead>
+    <tr>
+<% show_columns_for(associated.first, column, columns_hash).each(:skip_groups => true) do |column| -%>
+      <th><%= show_label(column) %></th>
+<% end -%>
+    </tr>
+  </thead>
+  <tbody>
+<% associated.each do |record| -%>
+    <%= render :partial => 'show_horizontal_record', :locals => {:record => record, :parent_record => parent_record, :columns => show_columns_for(associated.first, column, columns_hash)} %>
+<% end -%>
+  </tbody>
+</table>

data/app/views/active_scaffold_overrides/_show_association_vertical.html.erb

@@ -0,0 +1,4 @@
+<% columns_hash = {} -%>
+<% associated.each do |record| -%>
+  <%= render :partial => "show_columns", :locals => {:columns => show_columns_for(record, column, columns_hash), :record => record} %>
+<% end -%>

data/app/views/active_scaffold_overrides/_show_columns.html.erb

@@ -1,14 +1,14 @@
 <dl>
-<% columns.each :for => @record do |column| %>
-  <dt><%= column.label -%></dt>
+<% columns.each :for => record do |column| %>
+  <dt><%= show_label(column) -%></dt>
 <% if column.respond_to? :each -%>
   <dd>
-    <%= render :partial => 'show_columns', :locals => {:columns => column} %>
+    <%= render :partial => 'show_columns', :locals => {:columns => column, :record => record} %>
 <% else -%>
     <% css_class = "#{column.name}-view"
      css_class.concat(" #{column.css_class}") unless column.css_class.nil? %>
     <dd class="<%= css_class.strip %>">
-    <%= show_column_value(@record, column) -%>
+    <%= show_column_value(record, column) -%>
 <% end -%>
   </dd>
 <% end -%>

data/app/views/active_scaffold_overrides/_show_horizontal_record.html.erb

@@ -0,0 +1,25 @@
+<%
+  columns_length = 0
+  columns_groups = []
+%>
+<tr>
+<% columns.each :for => record do |column| -%>
+  <%
+    if column.respond_to? :each
+      columns_groups << column
+      next
+    end
+    columns_length += 1
+  %>
+  <%= content_tag :td, content_tag(:span, show_column_value(record, column)), :class => "#{column.name}-column #{:numeric if column.number?}" %>
+<% end -%>
+</tr>
+<% columns_groups.each do |columns| %>
+<tr>
+  <td colspan="<%= columns_length %>">
+<% columns.each do |column| %>
+    <%= show_column_value(record, column) %>
+<% end %>
+  </td>
+</tr>
+<% end -%>

data/lib/active_scaffold/data_structures/column.rb

@@ -120,7 +120,12 @@ module ActiveScaffold::DataStructures
     end
 
     def list_ui
-      @list_ui || @form_ui
+      @list_ui || form_ui
+    end
+
+    attr_writer :show_ui
+    def show_ui
+      @show_ui || list_ui
     end
 
     attr_writer :search_ui

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -10,7 +10,7 @@ module ActiveScaffold
           # performance of our default formatting. see issue #138.
           send(method, record, column)
         # second, check if the dev has specified a valid list_ui for this column
-        elsif column.list_ui && (method = override_show_column_ui(column.list_ui))
+        elsif column.show_ui && (method = override_show_column_ui(column.show_ui))
           send(method, record, column)
         else
           if column.column && (method = override_show_column_ui(column.column.type))
@@ -25,13 +25,35 @@ module ActiveScaffold
         simple_format(clean_column_value(record.send(column.name)))
       end
 
+      def active_scaffold_show_horizontal(record, column)
+        raise ":horizontal show_ui must be used on association column" unless column.association
+        render :partial => 'show_association', :locals => {:column => column, :parent_record => record, :show_partial => :horizontal}
+      end
+
+      def active_scaffold_show_vertical(record, column)
+        raise ":vertical show_ui must be used on association column" unless column.association
+        render :partial => 'show_association', :locals => {:column => column, :parent_record => record, :show_partial => :vertical}
+      end
+
+      def show_columns_for(record, parent_column = nil, hash = {})
+        hash[record.class] ||= begin
+          columns = active_scaffold_config_for(record.class).show.columns
+          columns.constraint_columns = [parent_column.association.reverse] if parent_column
+          columns
+        end
+      end
+
+      def show_label(column)
+        column.label
+      end
+
       def show_column_override(column)
         override_helper column, 'show_column'
       end
 
       # the naming convention for overriding show types with helpers
-      def override_show_column_ui(list_ui)
-        method = "active_scaffold_show_#{list_ui}"
+      def override_show_column_ui(show_ui)
+        method = "active_scaffold_show_#{show_ui}"
         method if respond_to? method
       end
     end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 22
+    PATCH = 23
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.22
+  version: 3.4.23
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -162,7 +162,11 @@ files:
 - app/views/active_scaffold_overrides/_row.html.erb
 - app/views/active_scaffold_overrides/_search.html.erb
 - app/views/active_scaffold_overrides/_show.html.erb
+- app/views/active_scaffold_overrides/_show_association.html.erb
+- app/views/active_scaffold_overrides/_show_association_horizontal.html.erb
+- app/views/active_scaffold_overrides/_show_association_vertical.html.erb
 - app/views/active_scaffold_overrides/_show_columns.html.erb
+- app/views/active_scaffold_overrides/_show_horizontal_record.html.erb
 - app/views/active_scaffold_overrides/_update_actions.html.erb
 - app/views/active_scaffold_overrides/_update_calculations.js.erb
 - app/views/active_scaffold_overrides/_update_column.js.erb