typus 0.9.29 → 0.9.30

data/README.rdoc

@@ -75,62 +75,12 @@ mailing list.
 Tell everybody about *Typus*, tell your friends and colleagues about 
 *Typus* and blog about *Typus*.
 
-== Fancybox for assets
+== Using Typus as a Gem?
 
-You can preview assets using Fancybox[http://fancybox.net/example].
+If you are using *Typus* as a gem add the following line at the end of the 
+<tt>Rakefile</tt> on the root of your Rails application.
 
-    # db/migrate/create_photos.rb
-
-    class CreatePhotos < ActiveRecord::Migration
-
-      def self.up
-        create_table :photos do |t|
-          t.string :asset_file_name
-          t.string :asset_content_type
-          t.integer :asset_file_size
-          t.datetime :asset_updated_at
-        end
-      end
-
-      def self.down
-        drop_table :photos
-      end
-
-    end
-
-    # app/models/photo.rb
-
-    ##
-    # Styles are predefined but you can use your own by defining them
-    # on `config/initializers/typus.rb`.
-    #
-    #     Typus::Configuration.options[:file_preview] = :my_preview
-    #     Typus::Configuration.options[:file_thumbnail] = :my_thumbnail
-    ##
-    class Photo < ActiveRecord::Base
-      has_attached_file :asset, :styles => { :typus_preview => "692x461", :typus_thumbnail => "100x100" }
-    end
-
-    # app/views/admin/photos/_index.html.erb
-
-    <%- content_for :stylesheets do -%>
-      <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
-    <%- end -%>
-
-    <%- content_for :javascripts do -%>
-
-      <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
-      <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
-
-      <script type="text/javascript" charset="utf-8">
-        $(document).ready(function() {
-          <%- @items.each do |item| -%>
-            $("#<%= item.to_dom %>").fancybox();
-          <%- end -%>
-        });
-      </script>
-
-    <%- end -%>
+    Dir["#{RAILS_ROOT}/vendor/gems/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
 
 == Contributors
 

data/VERSION

@@ -1 +1 @@
-0.9.29
+0.9.30

data/app/controllers/admin/master_controller.rb

@@ -109,17 +109,37 @@ class Admin::MasterController < ApplicationController
   end
 
   def edit
+
     item_params = params.dup
     %w( action controller model model_id back_to id resource resource_id page ).each { |p| item_params.delete(p) }
+
     # We assign the params passed trough the url
     @item.attributes = item_params
+
+    # If we want to display only user items, we don't want the links previous and 
+    # next linking to records from other users.
+    conditions = if @resource[:class].typus_options_for(:only_user_items)
+                   { Typus.user_fk => @current_user.id }
+                 end
+
+    item_params.merge!(conditions || {})
     @previous, @next = @item.previous_and_next(item_params)
+
     select_template :edit
+
   end
 
   def show
 
-    @previous, @next = @item.previous_and_next
+    check_ownership_of_item and return if @resource[:class].typus_options_for(:only_user_items)
+
+    # If we want to display only user items, we don't want the links previous and 
+    # next linking to records from other users.
+    conditions = if @resource[:class].typus_options_for(:only_user_items)
+                   { Typus.user_fk => @current_user.id }
+                 end
+
+    @previous, @next = @item.previous_and_next(conditions || {})
 
     respond_to do |format|
       format.html { select_template :show }
@@ -193,7 +213,7 @@ class Admin::MasterController < ApplicationController
 
   ##
   # Relate a model object to another, this action is used only by the 
-  # has_and_belongs_to_many relationships.
+  # has_and_belongs_to_many and has_many relationships.
   #
   def relate
 
@@ -206,35 +226,33 @@ class Admin::MasterController < ApplicationController
                         :model_a => resource_class.typus_human_name, 
                         :model_b => @resource[:class].typus_human_name)
 
-    redirect_to :action => @resource[:class].typus_options_for(:default_action_on_item), 
-                :id => @item.id, 
-                :anchor => resource_tableized
+    redirect_to :back
 
   end
 
   ##
-  # Remove relationship between models.
+  # Remove relationship between models, this action never removes items!
   #
   def unrelate
 
     resource_class = params[:resource].classify.constantize
     resource = resource_class.find(params[:resource_id])
 
-    case params[:association]
-    when 'has_and_belongs_to_many'
-      @item.send(resource_class.table_name).delete(resource)
-      message = "{{model_a}} unrelated from {{model_b}}."
-    when 'has_many', 'has_one'
-      resource.destroy
-      message = "{{model_a}} removed from {{model_b}}."
+    if @resource[:class].
+       reflect_on_association(resource_class.table_name.singularize.to_sym).
+       try(:macro) == :has_one
+      attribute = resource_class.table_name.singularize
+      @item.update_attribute attribute, nil
+    else
+      attribute = resource_class.table_name
+      @item.send(attribute).delete(resource)
     end
 
-    flash[:success] = _(message, :model_a => resource_class.typus_human_name, :model_b => @resource[:class].typus_human_name)
+    flash[:success] = _("{{model_a}} unrelated from {{model_b}}.", 
+                        :model_a => resource_class.typus_human_name, 
+                        :model_b => @resource[:class].typus_human_name)
 
-    redirect_to :controller => @resource[:self], 
-                :action => @resource[:class].typus_options_for(:default_action_on_item), 
-                :id => @item.id, 
-                :anchor => resource_class.table_name
+    redirect_to :back
 
   end
 

data/app/helpers/admin/form_helper.rb

@@ -115,15 +115,41 @@ module Admin::FormHelper
                        :resource_id => @item.id, 
                        foreign_key => @item.id }
 
+      condition = if @resource[:class].typus_user_id? && !@current_user.is_root?
+                    @item.owned_by?(@current_user)
+                  else
+                    true
+                  end
+
+      if condition
+        add_new = <<-HTML
+  <small>#{link_to _("Add new"), link_options if @current_user.can_perform?(model_to_relate, 'create')}</small>
+        HTML
+      end
+
       html << <<-HTML
 <a name="#{field}"></a>
-<div class="box_relationships">
+<div class="box_relationships" id="#{model_to_relate_as_resource}">
   <h2>
   #{link_to model_to_relate.typus_human_name.pluralize, { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id }, :title => _("{{model}} filtered by {{filtered_by}}", :model => model_to_relate.typus_human_name.pluralize, :filtered_by => @item.typus_name)}
-  <small>#{link_to _("Add new"), link_options if @current_user.can_perform?(model_to_relate, 'create')}</small>
+  #{add_new}
   </h2>
       HTML
 
+      ##
+      # It's a has_many relationship, so items that are already assigned to another
+      # entry are assigned to that entry.
+      #
+      items_to_relate = model_to_relate.find(:all, :conditions => ["#{foreign_key} is ?", nil])
+      if condition && !items_to_relate.empty?
+        html << <<-HTML
+  #{form_tag :action => 'relate', :id => @item.id}
+  #{hidden_field :related, :model, :value => model_to_relate}
+  <p>#{select :related, :id, items_to_relate.collect { |f| [f.typus_name, f.id] }.sort_by { |e| e.first } } &nbsp; #{submit_tag _("Add"), :class => 'button'}</p>
+  </form>
+        HTML
+      end
+
       conditions = if model_to_relate.typus_options_for(:only_user_items) && !@current_user.is_root?
                     { Typus.user_fk => @current_user }
                   end
@@ -168,9 +194,13 @@ module Admin::FormHelper
       reflection = @resource[:class].reflect_on_association(field.to_sym)
       association = reflection.macro
 
-      condition = !(@resource[:class].typus_user_id? && @current_user.id == @item.send(Typus.user_fk))
+      condition = if @resource[:class].typus_user_id? && !@current_user.is_root?
+                    @item.owned_by?(@current_user)
+                  else
+                    true
+                  end
 
-      unless condition
+      if condition
         add_new = <<-HTML
   <small>#{link_to _("Add new"), :controller => field, :action => 'new', :back_to => @back_to, :resource => @resource[:self], :resource_id => @item.id if @current_user.can_perform?(model_to_relate, 'create')}</small>
         HTML
@@ -178,21 +208,24 @@ module Admin::FormHelper
 
       html << <<-HTML
 <a name="#{field}"></a>
-<div class="box_relationships">
+<div class="box_relationships" id="#{model_to_relate_as_resource}">
   <h2>
   #{link_to model_to_relate.typus_human_name.pluralize, :controller => "admin/#{model_to_relate_as_resource}"}
   #{add_new}
   </h2>
       HTML
+
       items_to_relate = (model_to_relate.find(:all) - @item.send(field))
-      unless condition || items_to_relate.empty?
+
+      if condition && !items_to_relate.empty?
         html << <<-HTML
   #{form_tag :action => 'relate', :id => @item.id}
   #{hidden_field :related, :model, :value => model_to_relate}
-  <p>#{ select :related, :id, items_to_relate.collect { |f| [f.typus_name, f.id] }.sort_by { |e| e.first } } &nbsp; #{submit_tag _("Add"), :class => 'button'}</p>
+  <p>#{select :related, :id, items_to_relate.collect { |f| [f.typus_name, f.id] }.sort_by { |e| e.first } } &nbsp; #{submit_tag _("Add"), :class => 'button'}</p>
   </form>
         HTML
       end
+
       items = @resource[:class].find(params[:id]).send(field)
       unless items.empty?
         html << build_list(model_to_relate, 

data/app/helpers/admin/table_helper.rb

@@ -35,7 +35,7 @@ module Admin::TableHelper
 
         action = if model.typus_user_id? && !@current_user.is_root?
                    # If there's a typus_user_id column on the table and logged user is not root ...
-                   item.owned_by?(@current_user) ? 'edit' : 'show'
+                   item.owned_by?(@current_user) ? item.class.typus_options_for(:default_action_on_item) : 'show'
                  elsif !@current_user.can_perform?(model, 'edit')
                    'show'
                  else
@@ -71,7 +71,7 @@ module Admin::TableHelper
                                      :method => :delete if condition
         when 'edit'
           # If we are editing content, we can relate and unrelate always!
-          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :association => association, :resource => model, :resource_id => item.id }, 
+          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :resource => model, :resource_id => item.id }, 
                                         :title => _("Unrelate"), 
                                         :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
                                         :unrelate_model => model.typus_human_name, 
@@ -84,7 +84,7 @@ module Admin::TableHelper
           condition = if @resource[:class].typus_user_id? && !@current_user.is_root?
                         @item.owned_by?(@current_user)
                       end
-          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :association => association, :resource => model, :resource_id => item.id }, 
+          perform = link_to unrelate, { :action => 'unrelate', :id => params[:id], :resource => model, :resource_id => item.id }, 
                                         :title => _("Unrelate"), 
                                         :confirm => _("Unrelate {{unrelate_model}} from {{unrelate_model_from}}?", 
                                         :unrelate_model => model.typus_human_name, 
@@ -167,20 +167,9 @@ module Admin::TableHelper
   end
 
   def typus_table_file_field(attribute, item, link_options = {})
-
-    attachment = attribute.split('_file_name').first
-    file_preview = Typus::Configuration.options[:file_preview]
-
-    if item.send(attachment).styles.member?(file_preview) && item.send("#{attachment}_content_type") =~ /^image\/.+/
-      <<-HTML
-<td><a id="#{item.to_dom}" href="#{item.send(attachment).url(file_preview)}" title="#{item.typus_name}">#{item.send(attribute)}</a></td>
-      HTML
-    else
-      <<-HTML
-<td>#{link_to item.send(attribute), item.send(attachment).url}</td>
-      HTML
-    end
-
+    <<-HTML
+<td>#{item.typus_preview_on_table(attribute)}</td>
+    HTML
   end
 
   def typus_table_tree_field(attribute, item)

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

@@ -21,8 +21,7 @@
            when :belongs_to
              raw_data.typus_name
            when :file
-             attachment = field.first.split('_file_name').first
-             @item.typus_preview(attachment)
+             @item.typus_preview(field.first)
            when :text
              defined?(RDiscount) ? markdown(raw_data) : raw_data
            else

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

@@ -1,44 +1,6 @@
-<%- content_for :stylesheets do -%>
-  <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
-<%- end -%>
-
-<%- content_for :javascripts do -%>
-
-  <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
-  <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
-
-  <script type="text/javascript" charset="utf-8">
-    $(document).ready(function() {
-      $("#<%= @item.to_dom %>").fancybox();
-    });
-  </script>
-
-<%- end -%>
-
-<%
-
-  attachment = attribute.split('_file_name').first
-  file_preview = Typus::Configuration.options[:file_preview]
-  file_thumbnail = Typus::Configuration.options[:file_thumbnail]
-
-  unless @item.send(attribute).blank?
-    item = @item.send(attachment)
-    preview = if @item.send("#{attachment}_content_type") =~ /^image\/.+/ && item.styles.member?(file_thumbnail)
-                <<-HTML
-<a id="#{@item.to_dom}" href="#{@item.send(attachment).url(file_preview)}" title="#{@item.typus_name}">
-#{image_tag item.url(file_thumbnail)}
-</a>
-                HTML
-              else
-                <<-HTML
-#{link_to @item.send(attribute), item.url}
-                HTML
-              end
-  end
-
-%>
+<% attachment = attribute.split('_file_name').first %>
 
 <li><label for="item_<%= attribute %>"><%= _(attachment.humanize) %></label>
 <%= file_field :item, attachment, :disabled => attribute_disabled?(attribute) %>
-<%= preview %>
+<%= @item.typus_preview(attribute) unless @item.send(attribute).blank? %>
 </li>

data/app/views/layouts/admin.html.erb

@@ -11,9 +11,12 @@
 
   <%= stylesheet_link_tag 'admin/reset', :media => 'screen' %>
   <%= stylesheet_link_tag 'admin/screen', :media => 'screen' %>
+  <%= stylesheet_link_tag 'admin/jquery.fancybox', :media => 'screen' %>
   <%= yield :stylesheets -%>
 
   <%= javascript_include_tag 'admin/application' %>
+  <%= javascript_include_tag 'admin/jquery-1.3.2.min' %>
+  <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %>
   <%= include_tiny_mce_if_needed if defined?(TinyMCE) -%>
   <%= yield :javascripts -%>
 

data/config/locales/de.yml

@@ -55,7 +55,6 @@ de:
   "{{model_a}} related to {{model_b}}": "{{model_a}} ist verknüpft mit {{model_b}}"
   "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} erfolgreich an {{model_b}} zugewiesen"
   "{{model_a}} unrelated from {{model_b}}": "{{model_a}} unverbunden mit {{model_b}}"
-  "{{model_a}} removed from {{model_b}}": "{{model_a}} erfolgreich von {{model_b}}entfernt"
   "Your new password is {{password}}": "Ihr neues Passwort ist {{password}}"
   "Add entry": "Eintrag erstellen"
   "Go to": "Gehe zu"

data/config/locales/es.yml

@@ -55,7 +55,6 @@ es:
   "{{model_a}} related to {{model_b}}": "{{model_a}} relacionado con {{model_b}}."
   "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} asignado satisfactoriamente a {{model_b}}."
   "{{model_a}} unrelated from {{model_b}}": "{{model_a}} no esta relacionado con {{model_b}}."
-  "{{model_a}} removed from {{model_b}}": "{{model_a}} borrado de {{model_b}}."
   "Your new password is {{password}}": "Tu nueva contraseña es {{password}}."
   "Add entry": "Añadir entrada"
   "Go to": "Ir a"

data/config/locales/fr.yml

@@ -55,7 +55,6 @@ fr:
   "{{model_a}} related to {{model_b}}": "{{model_a}} associé à {{model_b}}."
   "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} associé à {{model_b}}."
   "{{model_a}} unrelated from {{model_b}}": "{{model_a}} dissocié de {{model_b}}."
-  "{{model_a}} removed from {{model_b}}": "{{model_a}} retiré de {{model_b}}."
   "Your new password is {{password}}": "Votre nouveau mot-de-passe est {{password}}."
   "Add entry": "Ajouter une entrée"
   "Go to": "Aller"

data/config/locales/language.yml.template

@@ -98,6 +98,5 @@
   "{{model}} successfully updated": 
   "{{model}} {{attribute}} changed": 
   "{{model_a}} related to {{model_b}}": 
-  "{{model_a}} removed from {{model_b}}": 
   "{{model_a}} successfully assigned to {{model_b}}": 
   "{{model_a}} unrelated from {{model_b}}": 

data/config/locales/pt-BR.yml

@@ -54,7 +54,6 @@ pt-BR:
   "{{model_a}} related to {{model_b}}": "{{model_a}} relacionado com {{model_b}}."
   "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} atribuído com sucesso a {{model_b}}."
   "{{model_a}} unrelated from {{model_b}}": "{{model_a}} não está relacionado com {{model_b}}."
-  "{{model_a}} removed from {{model_b}}": "{{model_a}} removido de {{model_b}}."
   "Your new password is {{password}}": "Sua nova senha é {{password}}."
   "Add entry": "Adicionar entrada"
   "Go to": "Ir a"

data/config/locales/ru.yml

@@ -55,7 +55,6 @@ ru:
   "{{model_a}} related to {{model_b}}": "{{model_a}} присоединен с {{model_b}}."
   "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} добавлен к {{model_b}}."
   "{{model_a}} unrelated from {{model_b}}": "{{model_a}} отсоединен от {{model_b}}."
-  "{{model_a}} removed from {{model_b}}": "{{model_a}} удален из {{model_b}}."
   "Your new password is {{password}}": "Ваш новый пароль: {{password}}."
   "Add entry": "Добавить запись"
   "Go to": "Перейти к"

data/generators/typus/templates/public/stylesheets/admin/screen.css

@@ -68,7 +68,7 @@ a.on { color: #333; font-weight: bold; text-decoration: underline; }
 
 /* @group Content */
 
-#content { float: left; padding: 1.5em 0; width: 700px; }
+#content { float: left; padding: 1.5em 0; width: 700px; overflow-x: auto; }
 
 #content h2 { font-size: 1.5em; font-weight: bold; margin: 0 0 0.5em 0; }
 #content h2 a { font-weight: bold; }

data/generators/typus/typus_generator.rb

@@ -46,7 +46,7 @@ class TypusGenerator < Rails::Generator::Base
         model_columns = model.columns - reject_columns
 
         # Don't show `text` fields and timestamps in lists.
-        list = model_columns.reject { |c| c.sql_type == 'text' || %w( created_at updated_at ).include?(c.name) }.map(&:name)
+        list = model_columns.reject { |c| c.sql_type == 'text' || %w( id created_at updated_at ).include?(c.name) }.map(&:name)
         # Don't show timestamps in forms.
         form = model_columns.reject { |c| %w( id created_at updated_at ).include?(c.name) }.map(&:name)
         # Show all model columns in the show action.