typus 1.0.0.pre8 → 1.0.0.pre9

data/app/helpers/admin/relationships_helper.rb

@@ -38,11 +38,9 @@ module Admin
 
       setup_relationship(field)
 
-      if @model_to_relate.count < @model_to_relate.typus_options_for(:habtm_limit)
-        @items_to_relate = (@model_to_relate.all - @item.send(field))
-        if set_condition && !@items_to_relate.empty?
-          form = build_relate_form
-        end
+      @items_to_relate = (@model_to_relate.all - @item.send(field))
+      if set_condition && !@items_to_relate.empty?
+        form = build_relate_form
       end
 
       build_pagination
@@ -89,22 +87,22 @@ module Admin
                           :resource => @resource.name, :resource_id => @item.id,
                           :back_to => @back_to }
 
-      return unless set_condition && @current_user.can?("create", @model_to_relate)
+      return unless set_condition && current_user.can?("create", @model_to_relate)
 
       link_to _t("Add new"), default_options.merge(options)
     end
 
     def set_condition
-      if @resource.typus_user_id? && @current_user.is_not_root?
-        @item.owned_by?(@current_user)
+      if @resource.typus_user_id? && current_user.is_not_root?
+        @item.owned_by?(current_user)
       else
         true
       end
     end
 
     def set_conditions
-      if @model_to_relate.typus_options_for(:only_user_items) && @current_user.is_not_root?
-        { Typus.user_fk => @current_user }
+      if @model_to_relate.typus_options_for(:only_user_items) && current_user.is_not_root?
+        { Typus.user_fk => current_user }
       end
     end
 
@@ -172,7 +170,7 @@ module Admin
                                     :action => 'new',
                                     :back_to => back_to,
                                     :selected => related_fk },
-                                    :confirm => confirm.join("\n\n") if @current_user.can?('create', related)
+                                    :confirm => confirm.join("\n\n") if current_user.can?('create', related)
 
       render "admin/templates/belongs_to",
              :resource => @resource,

data/app/helpers/admin/resources_helper.rb

@@ -11,18 +11,14 @@ module Admin
     include TableHelper
 
     #--
-    # If there's a partial with a "microformat" of the data we want to
-    # display, this will be used, otherwise we use a default table which
-    # it's build from the options defined on the yaml configuration file.
+    # 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)
-      template = "app/views/admin/#{resource}/_#{resource.singularize}.html.erb"
-
-      if File.exist?(template)
-        render :partial => template.gsub('/_', '/'), :collection => items, :as => :item
-      else
-        build_table(model, fields, items, link_options, association)
-      end
+      render "admin/#{resource}/list", :items => items
+    rescue ActionView::MissingTemplate
+      build_table(model, fields, items, link_options, association)
     end
 
     def display_link_to_previous
@@ -55,20 +51,6 @@ module Admin
       render File.join(path, "pagination") if @items.prev || @items.next
     end
 
-=begin
-
-    # TODO: This method should show a list of actions for the actual record.
-    def custom_actions(klass)
-      options = { :controller => klass.to_resource }
-      items = klass.typus_actions_on("index").map do |action|
-        if @current_user.can?(action, klass)
-          (link_to _t(action.humanize), options.merge(:action => action))
-        end
-      end
-    end
-
-=end
-
     private
 
     def path

data/app/helpers/admin/search_helper.rb

@@ -8,7 +8,7 @@ module Admin
 
       search_by = typus_search.collect { |x| resource.human_attribute_name(x) }.to_sentence
       search_params = params.dup
-      %w(action controller id search page).each { |p| search_params.delete(p) }
+      %w(action controller id search page utf8).each { |p| search_params.delete(p) }
       hidden_params = search_params.map { |k, v| hidden_field_tag(k, v) }
 
       render "admin/helpers/search/search", :hidden_params => hidden_params, :search_by => search_by

data/app/helpers/admin/sidebar_helper.rb

@@ -7,9 +7,13 @@ module Admin
       app_name = @resource.typus_application
 
       Typus.application(app_name).sort {|a,b| a.constantize.model_name.human <=> b.constantize.model_name.human}.each do |resource|
-        next unless @current_user.resources.include?(resource)
+        next unless current_user.resources.include?(resource)
         klass = resource.constantize
-        resources[resource] = default_actions(klass) + export(klass) + custom_actions(klass)
+
+        resources[resource] = default_actions(klass)
+        resources[resource] += export(klass) if params[:action] == 'index'
+        resources[resource] += custom_actions(klass)
+
         resources[resource].compact!
       end
 
@@ -19,32 +23,25 @@ module Admin
     def default_actions(klass)
       actions = []
 
-      if @current_user.can?("create", klass)
-        options = { :controller => klass.to_resource }
-        message = _t("Add new")
-        actions << (link_to_unless_current message, options.merge(:action => "new"))
+      if current_user.can?("create", klass)
+        actions << link_to_unless_current(_t("Add new"), :action => "new")
       end
 
-      message = _t("List")
-      options = { :controller => klass.to_resource }
-      actions << (link_to_unless_current message, options)
+      actions << link_to_unless_current(_t("List"), :action => "index")
 
       return actions
     end
 
     def export(klass)
-      return [] unless params[:action] == "index"
-
       klass.typus_export_formats.map do |format|
         link_to _t("Export as %{format}", :format => format.upcase), params.merge(:format => format)
       end
     end
 
     def custom_actions(klass)
-      options = { :controller => klass.to_resource }
-      klass.typus_actions_on("index").map do |action|
-        if @current_user.can?(action, klass)
-          (link_to_unless_current _t(action.humanize), options.merge(:action => action))
+      klass.typus_actions_on(params[:action]).map do |action|
+        if current_user.can?(action, klass)
+          link_to_unless_current(_t(action.humanize), params.merge(:action => action))
         end
       end
     end

data/app/helpers/admin/table_helper.rb

@@ -63,10 +63,10 @@ module Admin
     end
 
     def table_default_action(model, item)
-      action = if model.typus_user_id? && @current_user.is_not_root?
+      action = if model.typus_user_id? && current_user.is_not_root?
                  # If there's a typus_user_id column on the table and logged user is not root ...
-                 item.owned_by?(@current_user) ? item.class.typus_options_for(:default_action_on_item) : "show"
-               elsif @current_user.cannot?("edit", model)
+                 item.owned_by?(current_user) ? item.class.typus_options_for(:default_action_on_item) : "show"
+               elsif current_user.cannot?("edit", model)
                  'show'
                else
                  item.class.typus_options_for(:default_action_on_item)
@@ -104,12 +104,12 @@ module Admin
 
       case params[:action]
       when 'index'
-        condition = if model.typus_user_id? && @current_user.is_not_root?
-                      item.owned_by?(@current_user)
-                    elsif (@current_user.id.eql?(item.id) && model.eql?(Typus.user_class))
+        condition = if model.typus_user_id? && current_user.is_not_root?
+                      item.owned_by?(current_user)
+                    elsif (current_user.id.eql?(item.id) && model.eql?(Typus.user_class))
                       false
                     else
-                      @current_user.can?('destroy', model)
+                      current_user.can?('destroy', model)
                     end
         confirm = _t("Remove %{resource}?", :resource => item.class.model_name.human)
       when 'edit'
@@ -122,8 +122,8 @@ module Admin
         # the owners of the owner record.
         # If the owner record doesn't have a foreign key (Typus.user_fk) we look
         # each item to verify the ownership.
-        condition = if @resource.typus_user_id? && @current_user.is_not_root?
-                      @item.owned_by?(@current_user)
+        condition = if @resource.typus_user_id? && current_user.is_not_root?
+                      @item.owned_by?(current_user)
                     end
         confirm = _t("Unrelate %{unrelate_model} from %{unrelate_model_from}?",
                     :unrelate_model => model.model_name.human,
@@ -145,7 +145,7 @@ module Admin
       unless att_value.nil?
         content = att_value.to_label
         action = item.send(attribute).class.typus_options_for(:default_action_on_item)
-        if @current_user.can?(action, att_value.class.name)
+        if current_user.can?(action, att_value.class.name)
           content = link_to content, :controller => "admin/#{att_value.class.to_resource}", :action => action, :id => att_value.id
         end
       end
@@ -180,7 +180,7 @@ module Admin
                   render "admin/helpers/preview",
                          :attribute => attribute,
                          :attachment => attribute,
-                         :content => item.send(attribute),
+                         :content => item.to_label,
                          :file_preview_is_image => file_preview_is_image,
                          :has_file_preview => has_file_preview,
                          :href => item.send(attribute).url(file_preview),
@@ -220,13 +220,13 @@ module Admin
     end
 
     def table_boolean_field(attribute, item)
-      boolean_hash = item.class.typus_boolean(attribute)
+      boolean_hash = item.class.typus_boolean(attribute).invert
       status = item.send(attribute)
 
       content = if status.nil?
                   Typus::Resources.human_nil
                 else
-                  message = _t(boolean_hash["#{status}".to_sym])
+                  message = _t(boolean_hash[status.to_s])
                   options = { :controller => "admin/#{item.class.to_resource}",
                               :action => "toggle",
                               :id => item.id,

data/app/views/admin/dashboard/show.html.erb

@@ -13,4 +13,4 @@
 
 <%= applications %>
 
-<%= resources %>
+<%= resources(current_user) %>

data/app/views/admin/helpers/_apps.html.erb

@@ -1,7 +1,8 @@
 <ul>
-  <li><%= link_to _t("Dashboard"), admin_dashboard_path %></li>
-  <% @current_user.applications.each do |app| %>
-    <% klass = Typus.application(app).include?(@resource.name) ? 'active' : nil %>
+  <% dashboard = 'active' if params[:controller].include?('dashboard') %>
+  <li><%= link_to _t("Dashboard"), admin_dashboard_path, :class => dashboard %></li>
+  <% current_user.applications.each do |app| %>
+    <% klass = (@resource && Typus.application(app).include?(@resource.name)) ? 'active' : nil %>
     <li><%= link_to _t(app), { :controller => Typus.application(app).sort {|a,b| a.constantize.model_name.human <=> b.constantize.model_name.human}.first.tableize }, { :class => klass } %></li>
   <% end %>
 </ul>

data/app/views/admin/helpers/_header.html.erb

@@ -1,7 +1,7 @@
 <h1 class="logo">
-  <% if Rails.application.routes.routes.map(&:name).include?(:root) %>
+  <% begin %>
     <%= link_to Typus.admin_title, root_path, :title => _t("View site") %>
-  <% else %>
+  <% rescue %>
     <%= Typus.admin_title %>
   <% end %>
 </h1>

data/app/views/admin/helpers/dashboard/_applications.html.erb

@@ -1,4 +1,4 @@
-<% @current_user.applications.each do |app| %>
+<% current_user.applications.each do |app| %>
 
   <table>
 
@@ -8,7 +8,7 @@
       </tr>
     </thead>
 
-    <% @current_user.application(app).each do |model| %>
+    <% current_user.application(app).each do |model| %>
 
       <%
         klass = model.constantize
@@ -21,7 +21,7 @@
           <%= link_to klass_human_name, admin_items_path %>
         </td>
         <td class="right">
-          <%= link_to_if @current_user.can?("create", klass), _t("Add"), admin_items_path.merge(:action => "new") %>
+          <%= link_to_if current_user.can?("create", klass), _t("Add"), admin_items_path.merge(:action => "new") %>
         </td>
       </tr>
 

data/app/views/admin/helpers/dashboard/_resources.html.erb

@@ -1,16 +1,20 @@
-<table>
+<% if resources.any? %>
 
-  <thead>
-    <tr>
-      <th colspan="2"><%= _t("Resources") %></th>
-    </tr>
-  </thead>
+  <table>
 
-  <% resources.each do |resource| %>
-    <tr class="<%= cycle("even", "odd") %>">
-    <td><%= link_to _t(resource.titleize.capitalize), :controller => "admin/#{resource.underscore}" %></td>
-    <td align="right" style="vertical-align: bottom;"></td>
-    </tr>
-  <% end %>
+    <thead>
+      <tr>
+        <th colspan="2"><%= _t("Resources") %></th>
+      </tr>
+    </thead>
 
-</table>
+    <% resources.each do |resource| %>
+      <tr class="<%= cycle("even", "odd") %>">
+      <td><%= link_to _t(resource.titleize.capitalize), :controller => "admin/#{resource.underscore}" %></td>
+      <td align="right" style="vertical-align: bottom;"></td>
+      </tr>
+    <% end %>
+
+  </table>
+
+<% end %>

data/app/views/admin/helpers/filters/_filters.html.erb

@@ -1,31 +1,13 @@
-<div id="filters">
-
-  <ul>
-
-    <%= form_tag nil, :method => :get do %>
+<%= form_tag nil, :method => :get do %>
 
+  <div id="filters">
+    <ul>
       <% filters.each do |filter| %>
-
-        <li>
-          <select name="<%= filter[:filter] %>">
-            <option value=""><%= filter[:message] %></option>
-            <% filter[:items].each do |key, value| %>
-            <% selected = "selected" if params[filter[:filter]].eql?(key.to_s) %>
-            <option <%= selected %> value="<%= key %>"><%= value %></option>
-            <% end %>
-          </select>
-        </li>
-
+        <li><%= select_tag filter[:filter], options_for_select(filter[:items], params[filter[:filter]]) %></li>
       <% end %>
+      <%= hidden_field_tag :search, params[:search] if params[:search] %>
+      <li><%= submit_tag _t("Filter"), :name => nil %></li>
+    </ul>
+  </div>
 
-    <%= hidden_field_tag :search, params[:search] %>
-
-    <li>
-      <%= submit_tag _t("Filter"), :name => nil %>
-    </li>
-
-    <% end %>
-
-  </ul>
-
-</div>
+<% end %>

data/app/views/admin/helpers/resources/_pagination.html.erb

@@ -1,26 +1,25 @@
 <div id="pagination">
 
-  <%
-    previous_text = "&larr; " + _t("Previous")
-    next_text = _t("Next") + " &rarr;"
-  %>
-
   <div class="left">
 
+    <% previous_text = ("&larr; " + _t("Previous")).html_safe %>
+
     <% if @items.prev? %>
-      <%= link_to raw(previous_text), params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
+      <%= link_to previous_text, params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
     <% else %>
-      <span class="disabled"><%= raw(previous_text) %></span>
+      <span class="disabled"><%= previous_text %></span>
     <% end %>
 
   </div>
 
   <div class="right">
 
+    <% next_text = (_t("Next") + " &rarr;").html_safe %>
+
     <% if @items.next? %>
-      <%= link_to raw(next_text), params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
+      <%= link_to next_text, params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
     <% else %>
-      <span class="disabled"><%= raw(next_text) %></span>
+      <span class="disabled"><%= next_text %></span>
     <% end %>
 
   </div>

data/app/views/admin/helpers/search/_search.html.erb

@@ -2,7 +2,7 @@
 
   <%= form_tag url_for(:controller => params[:controller]), :method => :get do %>
     <ul>
-      <li><input id="quicksearch" name="search" type="text" title="<%= params[:search] || _t("Search") %>"/></li>
+      <li><%= search_field_tag "search", nil, :id => "quicksearch", :title => (params[:search] || _t("Search")) %></li>
     </ul>
     <% hidden_params.each do |field| %>
       <%= field %>

data/app/views/admin/mailer/reset_password_link.text.erb

@@ -4,3 +4,6 @@
     <%= @url %>
 
 <%= _t("If you didn't request a password update, you can ignore this message") %>
+
+--
+<%= Typus.admin_title %>

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

@@ -1,11 +1,11 @@
-<%= form_for @item, :url  => options, :html => { :multipart => true } do |form| %>
+<%= form_for @item, :url  => options[:options], :html => { :multipart => true } do |form| %>
 
   <% if @item.errors.any? %>
   <div id="errorExplanation">
     <h3><%= pluralize(@item.errors.count, "error") %> prohibited this page from being saved:</h3>
     <ul>
-    <% @item.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
+    <% @item.errors.full_messages.each do |full_message| %>
+      <li><%= full_message %></li>
     <% end %>
     </ul>
   </div>
@@ -19,7 +19,7 @@
 
   <fieldset class="buttons">
     <ol>
-      <li><%= submit_tag button , :class => "commit" %> or <%= link_to _t("Cancel and go back").downcase, :action => "index" %></li>
+      <li><%= submit_tag options[:button] , :class => "commit" %> or <%= link_to _t("Cancel and go back").downcase, :action => "index" %></li>
     </ol>
   </fieldset>