typus 3.1.1 → 3.1.2

data/CHANGELOG

@@ -1,6 +1,13 @@
 = 3.2.0 (unreleased)
 
-= 3.1.1 (unreleased)
+= 3.1.2
+
+ * [CHANGED] Images, links and belongs_to associations do not have links
+   when popup mode. This will avoid an "Inception" problem.
+
+ * [FIXED] Problems on HABTM associations when generating association names.
+
+= 3.1.1
 
  * [CHANGED] Removed user guide. Docs can now be found at http://docs.typuscmf.com/
 

data/README.md

@@ -55,7 +55,7 @@ user to be able to run tests.
 
 ## Links
 
-- [Documentation](https://docs.typuscmf.com/)
+- [Documentation](http://docs.typuscmf.com/)
 - [Issues](https://github.com/typus/typus/issues)
 - [Source Code][typus] and [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)

data/app/assets/javascripts/typus/jquery.application.js

@@ -2,7 +2,7 @@ $(document).ready(function() {
 
     $("#quicksearch").searchField();
 
-    $('.resource :input', document.myForm).bind("change", function() { setConfirmUnload(true); });
+    $(".resource :input", document.myForm).bind("change", function() { setConfirmUnload(true); });
 
     $("a.fancybox").fancybox({
         'titlePosition': 'over',
@@ -11,24 +11,6 @@ $(document).ready(function() {
         'scrolling': false,
     });
 
-    $(".iframe_with_form_reload").fancybox({
-        'width': 720,
-        'height': '90%',
-        'autoScale': false,
-        'transitionIn': 'none',
-        'transitionOut': 'none',
-        'type': 'iframe',
-        'centerOnScroll': true,
-        'scrolling': false,
-        onClosed: function() {
-            var attribute = Typus.resource_attribute;
-            var text = Typus.resource_to_label;
-            var value = Typus.resource_id;
-            $(attribute).append(new Option(text, value, true, true));
-            $(".chzn-select").trigger("liszt:updated");
-        },
-    });
-
     $(".iframe").fancybox({
         'width': 720,
         'height': '90%',
@@ -39,8 +21,15 @@ $(document).ready(function() {
         'centerOnScroll': true,
         'scrolling': false,
         onClosed: function() {
-            if (Typus.parent_location_reload)
+            if (Typus.parent_location_reload) {
                 parent.location.reload(true);
+            } else {
+                var attribute = Typus.resource_attribute;
+                var text = Typus.resource_to_label;
+                var value = Typus.resource_id;
+                $(attribute).append(new Option(text, value, true, true));
+                $(".chzn-select").trigger("liszt:updated");
+            }
         },
     });
 

data/app/assets/stylesheets/typus/application.css

@@ -6,7 +6,7 @@
 *= require typus/reset
 *= require typus/layout
 *= require typus/defaults
-*= require typus/errors
+*= require typus/feedback
 *= require typus/account
 *= require typus/header
 *= require typus/content

data/app/assets/stylesheets/typus/{errors.css → feedback.css}

@@ -31,3 +31,9 @@
 
 #errorExplanation ul { margin: 1em 1.5em; }
 #errorExplanation ul li { list-style: square!important; margin: 0!important; }
+
+.notice p,
+.alert p {
+  margin: 0;
+  padding: 5px 0;
+}

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

@@ -41,7 +41,7 @@ module Admin::Resources::DataTypes::BelongsToHelper
     if att_value = item.send(attribute)
       action = item.send(attribute).class.typus_options_for(:default_action_on_item)
       message = att_value.to_label
-      if admin_user.can?(action, att_value.class.name)
+      if !params[:_popup] && admin_user.can?(action, att_value.class.name)
         message = link_to(message, :controller => "/admin/#{att_value.class.to_resource}", :action => action, :id => att_value.id)
       end
     end
@@ -51,9 +51,14 @@ module Admin::Resources::DataTypes::BelongsToHelper
 
   def display_belongs_to(item, attribute)
     data = item.send(attribute)
-    link_to data.to_label, { :controller => data.class.to_resource,
-                             :action => params[:action],
-                             :id => data.id }
+
+    options = {
+      :controller => data.class.to_resource,
+      :action => params[:action],
+      :id => data.id
+    }
+
+    params[:_popup] ? data.to_label : link_to(data.to_label, options)
   end
 
   def belongs_to_filter(filter)
@@ -78,7 +83,7 @@ module Admin::Resources::DataTypes::BelongsToHelper
                         :action => 'new',
                         :attribute => options[:attribute],
                         :_popup => true }
-    link_to Typus::I18n.t("Add New"), default_options, { :class => 'iframe_with_form_reload' }
+    link_to Typus::I18n.t("Add New"), default_options, { :class => 'iframe' }
   end
 
 end

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

@@ -27,7 +27,7 @@ module Admin::Resources::DataTypes::DragonflyHelper
              :preview => data.process(:thumb, Typus.image_preview_size).url,
              :thumb => data.process(:thumb, Typus.image_table_thumb_size).url
     else
-      link_to data.name, data.url
+      params[:_popup] ? data.name : link_to(data.name, data.url)
     end
   end
 
@@ -42,7 +42,9 @@ module Admin::Resources::DataTypes::DragonflyHelper
              :thumb => data.process(:thumb, Typus.image_thumb_size).url,
              :options => options
     else
-      link_to data.name, data.url
+      html = params[:_popup] ? data.name : link_to(data.name, data.url)
+      # OPTIMIZE: Generate the tag with Ruby.
+      "<p>#{html}</p>".html_safe
     end
   end
 

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

@@ -11,7 +11,7 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
 
     resource_ids = "#{attribute.singularize}_ids"
     html_options = { :disabled => attribute_disabled?(resource_ids.to_sym) }
-    model = @resource.name.downcase.gsub("::", "_")
+    model = @resource.name.underscore.gsub("/", "_")
     options = { :attribute => "#{model}_#{attribute}" }
 
     label_text = @resource.human_attribute_name(attribute)
@@ -32,7 +32,7 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
     render "admin/templates/has_and_belongs_to_many", locals
   end
 
-  def build_label_text_for_has_and_belongs_to_many(klass, html_options, options)
+  def build_label_text_for_has_and_belongs_to_many(klass, html_options, options = {})
     if html_options[:disabled] == true
       Typus::I18n.t("Read only")
     elsif admin_user.can?('create', klass) && !headless_mode?
@@ -46,7 +46,7 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
                 :attribute => options[:attribute],
                 :_popup => true }
 
-    link_to Typus::I18n.t("Add New"), options, { :class => "iframe_with_form_reload" }
+    link_to Typus::I18n.t("Add New"), options, { :class => "iframe" }
   end
 
 end

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

@@ -12,8 +12,12 @@
 
   <fieldset class="buttons">
     <ol>
-      <% build_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>
+      <% build_save_options.each do |key, value, special| %>
+        <%
+          message = Typus::I18n.t(value)
+          options = { :name => key, :onclick => "setConfirmUnload(false);", :disable_with => message  }
+        %>
+        <li><%= submit_tag message, options %></li>
       <% end %>
     </ol>
   </fieldset>

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

@@ -1,3 +1,7 @@
-<%= link_to preview, :class => "fancybox" do %>
+<% if params[:_popup] %>
   <%= image_tag thumb, :alt => preview %>
+<% else %>
+  <%= link_to preview, :class => "fancybox" do %>
+    <%= image_tag thumb, :alt => preview %>
+  <% end %>
 <% end %>

data/lib/typus/orm/active_record/admin_user_v1.rb

@@ -81,10 +81,6 @@ module Typus
             self.salt = generate_hash("--#{Time.zone.now.to_s(:number)}--#{email}--") if new_record?
           end
 
-          def set_token
-            self.token = "#{SecureRandom.hex(3)}-#{SecureRandom.hex(3)}"
-          end
-
           def password_required?
             crypted_password.blank? || !password.blank?
           end

data/lib/typus/orm/active_record/admin_user_v2.rb

@@ -71,10 +71,6 @@ module Typus
             self.password_digest = BCrypt::Password.create(unencrypted_password)
           end
 
-          def set_token
-            self.token = "#{SecureRandom.hex(6)}-#{SecureRandom.hex(6)}"
-          end
-
           def password_must_be_strong
             if password.present?
               errors.add(:password, :too_short, :count => 7) unless password.size > 6

data/lib/typus/orm/active_record/user/instance_methods.rb

@@ -64,6 +64,13 @@ module Typus
             id == resource.send(Typus.user_foreign_key)
           end
 
+          def set_token
+            token = "#{SecureRandom.hex(6)}-#{SecureRandom.hex(6)}"
+            token.encode!('UTF-8') if token.respond_to?(:encode)
+            self.token = token
+          end
+          protected :set_token
+
         end
       end
     end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70333450722940 !ruby/object:Gem::Requirement
+  requirement: &70188177679660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333450722940
+  version_requirements: *70188177679660
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70333450722120 !ruby/object:Gem::Requirement
+  requirement: &70188177679240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333450722120
+  version_requirements: *70188177679240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70333450720960 !ruby/object:Gem::Requirement
+  requirement: &70188177678740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333450720960
+  version_requirements: *70188177678740
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -65,7 +65,7 @@ files:
 - app/assets/stylesheets/typus/content.css
 - app/assets/stylesheets/typus/custom.css
 - app/assets/stylesheets/typus/defaults.css
-- app/assets/stylesheets/typus/errors.css
+- app/assets/stylesheets/typus/feedback.css
 - app/assets/stylesheets/typus/footer.css
 - app/assets/stylesheets/typus/forms.css
 - app/assets/stylesheets/typus/hacks.css
@@ -316,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 431185922972537498
+      hash: -275893211556444060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -325,10 +325,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 431185922972537498
+      hash: -275893211556444060
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold