gluttonberg-core 2.5.1 → 2.5.2

data/app/helpers/gluttonberg/admin.rb

@@ -409,7 +409,8 @@ module ActionView
 
         def datetime_field(field_name,date_field_html_opts = {},time_field_html_opts = {})
           date_field_html_opts["data-datepicker"] = "bsdatepicker"
-          date_field_html_opts[:onblur] = "checkDateFormat(this,'.#{field_name}_error');combine_datetime('#{field_name}');"
+          unique_field_name = "#{field_name}_#{Gluttonberg::Member.generateRandomString}"
+          date_field_html_opts[:onblur] = "checkDateFormat(this,'.#{unique_field_name}_error');combine_datetime('#{unique_field_name}');"
           if date_field_html_opts[:class].blank?
             date_field_html_opts[:class] = "small datefield"
 
@@ -422,7 +423,7 @@ module ActionView
           else
             time_field_html_opts[:class] += " timefield"
           end
-          time_field_html_opts[:onblur] = "checkTimeFormat(this,'.#{field_name}_error');combine_datetime('#{field_name}')"
+          time_field_html_opts[:onblur] = "checkTimeFormat(this,'.#{unique_field_name}_error');combine_datetime('#{unique_field_name}')"
 
           html = ""
           date = ""
@@ -431,15 +432,15 @@ module ActionView
             date = self.object.send(field_name).strftime("%d/%m/%Y")
             time = self.object.send(field_name).strftime("%I:%M %p")
           end
-          html += text_field_tag("#{field_name}_date" , date , date_field_html_opts )
+          html += text_field_tag("#{unique_field_name}_date" , date , date_field_html_opts )
           html += "<span class='date'>DD/MM/YYYY</span>"
           html += " "
-          html += text_field_tag("#{field_name}_time" , time , time_field_html_opts )
+          html += text_field_tag("#{unique_field_name}_time" , time , time_field_html_opts )
           html += "<span class='date time'>HH:MM AM/PM</span>"
-          html += self.hidden_field("#{field_name}" ,  :class => "#{field_name}")
-          html += "<label class='error #{field_name}_error'></label>"
+          html += self.hidden_field("#{field_name}" ,  :class => "#{unique_field_name}")
+          html += "<label class='error #{unique_field_name}_error'></label>"
           html += "<div class='clear'></div>"
-          html += "<script type='text/javascript'>$(document).ready(function() { combine_datetime('#{field_name}'); }); </script>"
+          html += "<script type='text/javascript'>$(document).ready(function() { combine_datetime('#{unique_field_name}'); }); </script>"
           html.html_safe
         end
 

data/app/views/layouts/gluttonberg.html.haml

@@ -52,13 +52,16 @@
           = active_link_to("Dashboard", admin_root_path, :id => "dashboard_nav" , :title => "Dashboard", :active => params[:controller].include?('gluttonberg/admin/main'))
         %li
           = active_link_to("Content", admin_pages_path, :id => "content_nav" , :title => "Content", :active => (params[:controller].include?('gluttonberg/admin/content') || (( Gluttonberg::Components.nav_entries.collect{|c| c[1]}).include?(controller_name.to_sym) )))
-        %li
-          = active_link_to("Library", admin_asset_category_path(:category => 'all' , :page => 1 ), :id => "library_nav" , :title => "Library" , :active => params[:controller].include?('gluttonberg/admin/asset_library')  )
 
         - for entry in Gluttonberg::Components.main_nav_entries
           -if entry[2].blank? || entry[2]==false || (entry[2]==true && session.user.is_super_admin)
             %li{:class => "custom"}
               = active_link_to(entry[0], url_for(entry[1]), :id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0]  )
+
+        %li
+          = active_link_to("Library", admin_asset_category_path(:category => 'all' , :page => 1 ), :id => "library_nav" , :title => "Library" , :active => params[:controller].include?('gluttonberg/admin/asset_library')  )
+
+
         - if Gluttonberg::Member.enable_members == true
           %li
             = active_link_to("Members", admin_membership_members_path, :id => "membership_nav" , :title => "Members" , :active => /^\/admin\/membership/)

data/lib/gluttonberg/content/slug_management.rb

@@ -10,21 +10,21 @@ module Gluttonberg
         klass.class_eval do
           extend ClassMethods
           include InstanceMethods
-          
+
           before_validation :slug_management
           class << self;  attr_accessor :slug_source_field_name end
           attr_accessor :current_slug
-          
-                    
+
+
         end
       end
-    
+
       module ClassMethods
-        
+
       end
-      
+
       module InstanceMethods
-        
+
         def get_slug_source
           if self.class.slug_source_field_name.blank?
             if self.respond_to?(:name)
@@ -37,19 +37,19 @@ module Gluttonberg
           end
           self.class.slug_source_field_name
         end
-        
+
         def slug=(new_slug)
           #if you're changing this regex, make sure to change the one in /javascripts/slug_management.js too
           # utf-8 special chars are fixed for new ruby 1.9.2
           unless new_slug.blank?
-            new_slug = new_slug.downcase.gsub(/\s/, '_').gsub(/[\!\*'"″′‟‛„‚”“”˝\(\)\;\:\.\@\&\=\+\$\,\/?\%\#\[\]]/, '')
+            new_slug = new_slug.to_s.downcase.gsub(/\s/, '_').gsub(/[\!\*'"″′‟‛„‚”“”˝\(\)\;\:\.\@\&\=\+\$\,\/?\%\#\[\]]/, '')
             new_slug = new_slug.gsub('__','_') # remove consective underscores
             new_slug = new_slug.gsub(/_$/,'') # remove trailing underscore
-          end  
+          end
           write_attribute(:slug, new_slug)
         end
-        
-        protected 
+
+        protected
         # Checks If slug is blank then tries to set slug using following logic
         # if slug_field_name is set then use its value and make it slug
         # otherwise checks for name column
@@ -77,12 +77,12 @@ module Gluttonberg
             if !already_exist.blank?
               if already_exist.length > 1 || (already_exist.length == 1 && already_exist.first.id != self.id )
                 self.slug= "#{self.slug}_#{already_exist.length+1}"
-              end  
+              end
             end
           end
-          
+
       end
-      
+
     end
   end
 end

data/lib/gluttonberg/version.rb

@@ -1,3 +1,3 @@
 module Gluttonberg
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluttonberg-core
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic