typus 3.1.0.rc6 → 3.1.0.rc7

data/app/helpers/admin/resources/data_types/paperclip_helper.rb

@@ -0,0 +1,38 @@
+module Admin::Resources::DataTypes::PaperclipHelper
+
+  def table_paperclip_field(attribute, item)
+    options = { :height => 25, :width => 25 }
+    typus_paperclip_preview(item, attribute, options)
+  end
+
+  def link_to_detach_attribute_for_paperclip(attribute)
+    validators = @item.class.validators.delete_if { |i| i.class != ActiveModel::Validations::PresenceValidator }.map { |i| i.attributes }.flatten.map { |i| i.to_s }
+    attachment = @item.send(attribute)
+
+    if attachment.exists? && !validators.include?("#{attribute}_file_name") && attachment
+      attribute_i18n = @item.class.human_attribute_name(attribute)
+      message = Typus::I18n.t("Remove")
+      label_text = <<-HTML
+#{attribute_i18n}
+<small>#{link_to message, { :action => 'update', :id => @item.id, :attribute => attribute, :_continue => true }, :confirm => Typus::I18n.t("Are you sure?")}</small>
+      HTML
+      label_text.html_safe
+    end
+  end
+
+  def typus_paperclip_preview(item, attachment, options = {})
+    data = item.send(attachment)
+    return unless data.exists?
+
+    styles = data.styles.keys
+    if data.content_type =~ /^image\/.+/ && styles.include?(Typus.file_preview) && styles.include?(Typus.file_thumbnail)
+      render "admin/templates/paperclip_preview",
+             :preview => data.url(Typus.file_preview, false),
+             :thumb => data.url(Typus.file_thumbnail, false),
+             :options => options
+    else
+      link_to data.original_filename, data.url(:original, false)
+    end
+  end
+
+end

data/app/helpers/admin/resources/data_types/position_helper.rb

@@ -0,0 +1,22 @@
+module Admin::Resources::DataTypes::PositionHelper
+
+  def table_position_field(attribute, item, connector = " / ")
+    html_position = []
+
+    [ [:move_to_top, "Top"],
+      [:move_higher,  "Up"],
+      [:move_lower,   "Down"],
+      [:move_to_bottom, "Bottom"] ].each do |key, value|
+
+      options = { :controller => "/admin/#{item.class.to_resource}", :action => "position", :id => item.id, :go => key }
+      should_be_inactive = (item.respond_to?(:first?) && ([:move_higher, :move_to_top].include?(key) && item.first?)) ||
+                           (item.respond_to?(:last?) &&  ([:move_lower, :move_to_bottom].include?(key) && item.last?))
+      html_position << link_to_unless(should_be_inactive, Typus::I18n.t(value), params.merge(options)) do |name|
+        %w(<span class="inactive">#{name}</span>)
+      end
+    end
+
+    "#{item.position}<br/><br/>#{html_position.compact.join(connector)}".html_safe
+  end
+
+end

data/app/helpers/admin/resources/data_types/selector_helper.rb

@@ -0,0 +1,11 @@
+module Admin::Resources::DataTypes::SelectorHelper
+
+  def table_selector_field(attribute, item)
+    item.mapping(attribute)
+  end
+
+  def display_selector(item, attribute)
+    item.mapping(attribute)
+  end
+
+end

data/app/helpers/admin/resources/data_types/string_helper.rb

@@ -0,0 +1,29 @@
+module Admin::Resources::DataTypes::StringHelper
+
+  def display_string(item, attribute)
+    item.send(attribute)
+  end
+
+  alias_method :display_text, :display_string
+  alias_method :display_position, :display_string
+  alias_method :display_integer, :display_string
+  alias_method :display_decimal, :display_string
+
+  def string_filter(filter)
+    values = set_context.send(filter.to_s).to_a
+
+    items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]
+    array = values.first.is_a?(Array) ? values : values.map { |i| [i, i] }
+    items += array
+  end
+
+  def table_string_field(attribute, item)
+    (raw_content = item.send(attribute)).present? ? raw_content : "—".html_safe
+  end
+
+  alias :table_decimal_field :table_string_field
+  alias :table_float_field :table_string_field
+  alias :table_integer_field :table_string_field
+  alias :table_virtual_field :table_string_field
+
+end

data/app/helpers/admin/resources/data_types/text_helper.rb

@@ -0,0 +1,7 @@
+module Admin::Resources::DataTypes::TextHelper
+
+  def table_text_field(attribute, item)
+    (raw_content = item.send(attribute)).present? ? truncate(raw_content) : "—".html_safe
+  end
+
+end

data/app/helpers/admin/resources/data_types/transversal_helper.rb

@@ -0,0 +1,8 @@
+module Admin::Resources::DataTypes::TransversalHelper
+
+  def table_transversal_field(attribute, item)
+    field_1, field_2 = attribute.split(".")
+    (related_item = item.send(field_1)) ? related_item.send(field_2) : "—".html_safe
+  end
+
+end

data/app/helpers/admin/resources/data_types/tree_helper.rb

@@ -0,0 +1,25 @@
+module Admin::Resources::DataTypes::TreeHelper
+
+  def table_tree_field(attribute, item)
+    item.parent ? item.parent.to_label : "—".html_safe
+  end
+
+  def typus_tree_field(attribute, form)
+    locals = { :attribute => attribute,
+               :form => form,
+               :label_text => @resource.human_attribute_name(attribute),
+               :values => expand_tree_into_select_field(@resource.roots, "parent_id") }
+
+    render "admin/templates/tree", locals
+  end
+
+  def expand_tree_into_select_field(items, attribute)
+    String.new.tap do |html|
+      items.each do |item|
+        html << %{<option #{"selected" if @item.send(attribute) == item.id} value="#{item.id}">#{"&nbsp;" * item.ancestors.size * 2} #{item.to_label}</option>\n}
+        html << expand_tree_into_select_field(item.children, attribute) unless item.children.empty?
+      end
+    end
+  end
+
+end

data/app/helpers/admin/resources/display_helper.rb

@@ -0,0 +1,26 @@
+module Admin::Resources::DisplayHelper
+
+  def build_display(item, fields)
+    fields.map do |attribute, type|
+      value = if (type == :boolean) || (data = item.send(attribute))
+                send("display_#{type}", item, attribute)
+              else
+                "—".html_safe
+              end
+
+      [@resource.human_attribute_name(attribute), value]
+    end
+  end
+
+  def typus_relationships
+    String.new.tap do |html|
+      @resource.typus_defaults_for(:relationships).each do |relationship|
+        association = @resource.reflect_on_association(relationship.to_sym)
+        next if association.macro == :belongs_to
+        next if admin_user.cannot?('read', association.class_name.typus_constantize)
+        html << send("typus_form_#{association.macro}", relationship)
+      end
+    end.html_safe
+  end
+
+end

data/app/helpers/admin/resources/filters_helper.rb

@@ -0,0 +1,36 @@
+module Admin::Resources::FiltersHelper
+
+  def build_filters(resource = @resource, params = params)
+    typus_filters = resource.typus_filters
+
+    return if typus_filters.empty?
+
+    locals = {}
+
+    locals[:filters] = typus_filters.map do |key, value|
+                         { :filter => set_filter(key, value), :items => send("#{value}_filter", key) }
+                       end
+
+    locals[:hidden_filters] = params.dup
+
+    # Remove default params.
+    rejections = %w(controller action locale utf8 sort_order order_by)
+    locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
+
+    # Remove also custom params.
+    rejections = locals[:filters].map { |f| f[:filter] }
+    locals[:hidden_filters].delete_if { |k, v| rejections.include?(k) }
+
+    render "helpers/admin/resources/filters", locals
+  end
+
+  def set_filter(key, value)
+    return key unless value == :belongs_to
+
+    att_assoc = @resource.reflect_on_association(key.to_sym)
+    class_name = att_assoc.options[:class_name] || key.capitalize.camelize
+    resource = class_name.typus_constantize
+    att_assoc.foreign_key
+  end
+
+end

data/app/helpers/admin/resources/form_helper.rb

@@ -0,0 +1,69 @@
+module Admin::Resources::FormHelper
+
+  def build_form(fields, form)
+    String.new.tap do |html|
+      fields.each do |key, value|
+        value = :template if (template = @resource.typus_template(key))
+        html << case value
+                when :belongs_to
+                  typus_belongs_to_field(key, form)
+                when :tree
+                  typus_tree_field(key, form)
+                when :boolean, :date, :datetime, :text, :time, :password, :selector, :dragonfly, :paperclip
+                  typus_template_field(key, value, form)
+                when :template
+                  typus_template_field(key, template, form)
+                else
+                  typus_template_field(key, :string, form)
+                end
+      end
+    end.html_safe
+  end
+
+  def typus_template_field(attribute, template, form)
+    options = { :start_year => @resource.typus_options_for(:start_year),
+                :end_year => @resource.typus_options_for(:end_year),
+                :minute_step => @resource.typus_options_for(:minute_step),
+                :disabled => attribute_disabled?(attribute),
+                :include_blank => true }
+
+    html_options = attribute_disabled?(attribute) ? { :disabled => 'disabled' } : {}
+
+    locals = { :resource => @resource,
+               :attribute => attribute,
+               :options => options,
+               :html_options => html_options,
+               :form => form,
+               :label_text => @resource.human_attribute_name(attribute) }
+
+    render "admin/templates/#{template}", locals
+  end
+
+  def attribute_disabled?(attribute)
+    if protected_attributes = @resource._protected_attributes
+      role = admin_user.is_root? ? :admin : :default
+      protected_attributes[role].include?(attribute)
+    end
+  end
+
+  def display_errors
+    render "helpers/admin/resources/errors"
+  end
+
+  def save_options
+    if Typus.user_class == @resource && admin_user.is_not_root?
+      options = { "_continue" => "Save and continue editing" }
+    end
+
+    if headless_mode? && params[:resource]
+      options = { "_saveandassign" => "Save and assign" }
+    end
+
+    if headless_mode?
+      options = { "_continue" => "Save and continue editing" }
+    end
+
+    options || { "_addanother" => "Save and add another", "_continue" => "Save and continue editing", "_save" => "Save" }
+  end
+
+end

data/app/helpers/admin/resources/list_helper.rb

@@ -0,0 +1,27 @@
+module Admin::Resources::ListHelper
+
+  def list_actions
+    resources_actions.map do |body, url, options|
+      if admin_user.can?(url[:action], @resource.name)
+        path = params.dup.merge!(url).compact.cleanup
+        link_to Typus::I18n.t(body), path, options
+      end
+    end.compact.join(" / ").html_safe
+  end
+
+  def build_actions(&block)
+    render "helpers/admin/resources/actions", :block => block
+  end
+
+  #--
+  # If partial `list` exists we will use it. This partial will have available
+  # the `@items` so we can do whatever we want there. Notice that pagination
+  # is still available.
+  #++
+  def build_list(model, fields, items, resource = @resource.to_resource, link_options = {}, association = nil, association_name = nil)
+    render "admin/#{resource}/list", :items => items
+  rescue ActionView::MissingTemplate
+    build_table(model, fields, items, link_options, association, association_name)
+  end
+
+end

data/app/helpers/admin/resources/relationships_helper.rb

@@ -0,0 +1,55 @@
+module Admin::Resources::RelationshipsHelper
+
+  def setup_relationship(field)
+    @field = field
+    @model_to_relate = @resource.reflect_on_association(field.to_sym).class_name.typus_constantize
+    @model_to_relate_as_resource = @model_to_relate.to_resource
+    @reflection = @resource.reflect_on_association(field.to_sym)
+    @association_name = @reflection.name.to_s
+  end
+
+  def build_pagination
+    items_per_page = @model_to_relate.typus_options_for(:per_page)
+    data = @item.send(@field).order(@model_to_relate.typus_order_by).where(set_conditions)
+    @items = data.page(params[:page]).per(items_per_page)
+  end
+
+  def build_relationship_table
+    build_list(@model_to_relate,
+               @model_to_relate.typus_fields_for(:relationship),
+               @items,
+               @model_to_relate_as_resource,
+               {},
+               @reflection.macro,
+               @association_name)
+  end
+
+  def build_add_new(options = {})
+    default_options = { :controller => "/admin/#{@model_to_relate.to_resource}",
+                        :action => "index",
+                        :resource => @resource.model_name,
+                        :layout => 'admin/headless',
+                        :resource_id => @item.id,
+                        :resource_action => 'relate',
+                        :return_to => request.path }
+
+    if set_condition && admin_user.can?("create", @model_to_relate)
+      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
+    end
+  end
+
+  def set_condition
+    if @resource.typus_user_id? && admin_user.is_not_root?
+      admin_user.owns?(@item)
+    else
+      true
+    end
+  end
+
+  def set_conditions
+    if @model_to_relate.typus_options_for(:only_user_items) && admin_user.is_not_root?
+      { Typus.user_foreign_key => admin_user }
+    end
+  end
+
+end

data/app/helpers/admin/resources/table_helper.rb

@@ -0,0 +1,61 @@
+module Admin::Resources::TableHelper
+
+  def build_table(model, fields, items, link_options = {}, association = nil, association_name = nil)
+    locals = { :model => model,
+               :fields => fields,
+               :items => items,
+               :link_options => link_options,
+               :headers => table_header(model, fields),
+               :association_name => association_name }
+
+    render "helpers/admin/resources/table", locals
+  end
+
+  def table_header(model, fields, params = params)
+    fields.map do |key, value|
+
+      key = key.gsub(".", " ") if key.to_s.match(/\./)
+      content = model.human_attribute_name(key)
+
+      if params[:action].eql?('index') && model.typus_options_for(:sortable)
+        association = model.reflect_on_association(key.to_sym)
+        order_by = association ? association.foreign_key : key
+
+        if (model.model_fields.map(&:first).map { |i| i.to_s }.include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
+          sort_order = case params[:sort_order]
+                       when 'asc' then ['desc', '↓']
+                       when 'desc' then ['asc', '↑']
+                       else [nil, nil]
+                       end
+          switch = sort_order.last if params[:order_by].eql?(order_by)
+          options = { :order_by => order_by, :sort_order => sort_order.first }
+          message = [content, switch].compact.join(" ").html_safe
+          link_to message, params.merge(options)
+        else
+          content
+        end
+
+      else
+        content
+      end
+
+    end
+  end
+
+  def table_fields_for_item(item, fields)
+    fields.map { |k, v| send("table_#{v}_field", k, item) }
+  end
+
+  def table_actions(model, item, association_name = nil)
+    resource_actions.map do |body, url, options, proc|
+      if admin_user.can?(url[:action], model.name)
+        next if proc && proc.respond_to?(:call) && proc.call(item) == false
+
+        link_to Typus::I18n.t(body),
+                params.dup.cleanup.merge(url).merge(:controller => "/admin/#{model.to_resource}", :id => item.id),
+                options
+      end
+    end.compact.join(" / ").html_safe
+  end
+
+end

data/app/helpers/admin/resources_helper.rb

@@ -1,38 +1,37 @@
-module Admin
-  module ResourcesHelper
-
-    include Admin::DisplayHelper
-    include Admin::ListHelper
-    include Admin::FiltersHelper
-    include Admin::FormHelper
-    include Admin::RelationshipsHelper
-    include Admin::FilePreviewHelper
-    include Admin::SearchHelper
-    include Admin::SidebarHelper
-    include Admin::TableHelper
-
-    def display_link_to_previous(params = params)
-      if params[:resource]
-
-        item_class = params[:resource].typus_constantize
-
-        # For some reason we are forced to set the /admin prefix to the controller
-        # when working with namespaced stuff.
-        url = { :controller => "/admin/#{item_class.to_resource}" }
-
-        if params[:resource_id]
-          item = item_class.find(params[:resource_id])
-          url.merge!(:action => 'edit', :id => item.id)
-        else
-          url.merge!(:action => 'new')
-        end
-
-        body = Typus::I18n.t("Cancel adding a new %{resource}?", :resource => @resource.model_name.human.downcase)
-
-        locals = { :body => body, :url => url }
-        render "admin/helpers/resources/display_link_to_previous", locals
-      end
+module Admin::ResourcesHelper
+
+  def search(resource = @resource, params = params)
+    if (typus_search = resource.typus_defaults_for(:search)) && typus_search.any?
+
+      hidden_filters = params.dup
+      rejections = %w(controller action locale utf8 sort_order order_by search page)
+      hidden_filters.delete_if { |k, v| rejections.include?(k) }
+
+      render "helpers/admin/resources/search", :hidden_filters => hidden_filters
+    end
+  end
+
+  def build_sidebar
+    resources = ActiveSupport::OrderedHash.new
+    app_name = @resource.typus_application
+
+    admin_user.application(app_name).sort { |a,b| a.typus_constantize.model_name.human <=> b.typus_constantize.model_name.human }.each do |resource|
+      klass = resource.typus_constantize
+      resources[resource] = [ link_to_unless_current(Typus::I18n.t("All #{klass.model_name.human.pluralize}"), :action => "index") ]
+      resources[resource] << link_to_unless_current(Typus::I18n.t("Add New"), :action => "new") if admin_user.can?("create", klass)
     end
 
+    render "helpers/admin/resources/sidebar", :resources => resources
+  end
+
+  # TODO: This method should be moved to `lib/typus/controller/actions.rb`
+  def resource_actions
+    @resource_actions ||= []
   end
+
+  # TODO: This method should be moved to `lib/typus/controller/actions.rb`
+  def resources_actions
+    @resources_actions ||= []
+  end
+
 end

data/app/views/admin/resources/_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_for @item, :url => options, :html => { :class => "resource", :multipart => true } do |form| %>
 
-  <%= render "admin/helpers/resources/errors" %>
+  <%= display_errors %>
 
   <fieldset class="inputs">
     <ol>
@@ -10,10 +10,9 @@
 
   <fieldset class="buttons">
     <ol>
-      <li><%= submit_tag button,
-                         :class => "commit",
-                         :onclick => "setConfirmUnload(false);",
-                         :disable_with => Typus::I18n.t("Sending data ...") %></li>
+      <% save_options.each do |key, value| %>
+        <li><%= submit_tag Typus::I18n.t(value), :name => key, :onclick => "setConfirmUnload(false);", :disable_with => Typus::I18n.t(value) %></li>
+      <% end %>
     </ol>
   </fieldset>
 

data/app/views/admin/resources/edit.html.erb

@@ -12,7 +12,12 @@
   <small><%= list_actions %></small>
 </h2>
 
-<%= display_link_to_previous %>
+<% if flash[:notice] && headless_mode? %>
+  <script>
+    $(document).ready(function() { parent.location.reload(); });
+  </script>
+<% end %>
+
 <%= display_flash_message %>
 <%= render 'edit' %>
 
@@ -23,4 +28,4 @@
 
 <%= render :partial => 'form', :locals => { :options => options, :button => button } %>
 
-<%= typus_relationships %>
+<%= typus_relationships unless headless_mode? %>

data/app/views/admin/resources/index.html.erb

@@ -15,11 +15,16 @@
 <%= render 'index' %>
 
 <ul class="predefined_filters">
-  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= resource.count %>)</li>
+  <li><%= link_to Typus::I18n.t("All"), params.dup.cleanup.merge(:action => 'index') %> (<%= resource.count %>)</li>
   <% predefined_filters.each do |filter, action, scope| %>
     <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
     <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
   <% end %>
+  <% unless resource.count.zero? %>
+    <li>|</li>
+    <li><%= link_to "CSV", :format => 'csv' %></li>
+    <li><%= link_to "XML", :format => 'xml' %></li>
+  <% end %>
 </ul>
 
 <% if (build_filters || search) %>
@@ -30,7 +35,11 @@
 <% end %>
 
 <% if @items.any? -%>
-  <%= build_list(@resource, fields, @items) %>
+  <% if controller.respond_to?(:bulk) %>
+    <%= build_actions { build_list(@resource, fields, @items) } %>
+  <% else %>
+    <%= build_list(@resource, fields, @items) %>
+  <% end %>
   <%= paginate(@items, Typus.pagination) %>
 <% else %>
   <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>

data/app/views/admin/resources/new.html.erb

@@ -10,12 +10,7 @@
   <small><%= list_actions %></small>
 </h2>
 
-<%= display_link_to_previous %>
 <%= render 'new' %>
 
-<%
-  options = params.dup.cleanup.merge(:action => 'create')
-  button = Typus::I18n.t("Create %{resource}", :resource => @resource.model_name.human)
-%>
-
-<%= render :partial => 'form', :locals => { :options => options, :button => button } %>
+<%= render :partial => 'form',
+           :locals => { :options => params.dup.cleanup.merge(:action => 'create') } %>

data/app/views/admin/templates/_belongs_to_with_autocomplete.html.erb

@@ -9,12 +9,8 @@
             <% if (item = @item.send(attribute)) %>
             prePopulate: [ { id: <%= item.id %>, name: "<%= item.to_label %>" } ],
             <% end %>
-            onAdd: function(item) {
-                $("#<%= label %>").val(item.id);
-            },
-            onDelete: function (item) {
-                $("#<%= label %>").val("");
-            }
+            onAdd: function(item) { $("#<%= label %>").val(item.id); },
+            onDelete: function (item) { $("#<%= label %>").val(""); }
         });
     });
   </script>

data/app/views/admin/templates/_dragonfly.html.erb

@@ -0,0 +1,5 @@
+<li id="<%= attribute %>">
+  <%= form.label attribute, link_to_detach_attribute_for_dragonfly(attribute) %>
+  <%= form.file_field attribute, options %>
+  <%= typus_dragonfly_preview(@item, attribute) %>
+</li>

data/app/views/admin/templates/_has_n.html.erb

@@ -5,8 +5,6 @@
     <small><%= add_new %></small>
   </h2>
 
-  <%= form %>
-
   <% if @items.any? -%>
     <%= table %>
     <%= paginate(@items, Typus.pagination.merge(:anchor => association_name)) %>

data/app/views/admin/templates/_paperclip.html.erb

@@ -0,0 +1,5 @@
+<li id="<%= attribute %>">
+  <%= form.label attribute, link_to_detach_attribute_for_paperclip(attribute) %>
+  <%= form.file_field attribute, options %>
+  <%= typus_paperclip_preview(@item, attribute) %>
+</li>

data/app/views/admin/templates/_paperclip_preview.html.erb

@@ -0,0 +1,3 @@
+<%= link_to preview, :class => "fancybox" do %>
+  <%= image_tag thumb, options.merge(:alt => preview) %>
+<% end %>

data/app/views/admin/templates/_selector.html.erb

@@ -1,11 +1,11 @@
 <%
   if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
-    html_options = { :disabled => 'disabled' }
+    html_options.merge!(:disabled => 'disabled')
     message = Typus::I18n.t("Read only")
   end
 %>
 
 <li id="<%= attribute %>">
   <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
-  <%= form.select attribute, @resource.send(attribute), options.merge!(:include_blank => false), html_options %>
+  <%= form.select attribute, @resource.send(attribute), options.merge!(:include_blank => true), html_options %>
 </li>