diff --git a/Gemfile b/Gemfile index 2809c60..ab27d84 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.0' +gem 'rails', '4.0.13' gem 'bcrypt-ruby', '~> 3.0.0' @@ -51,8 +51,8 @@ group :doc do gem 'sdoc', require: false end -gem "capistrano", group: :development -gem "rvm-capistrano", group: :development +gem "capistrano", group: :development, :require => false +gem "rvm-capistrano", group: :development, :require => false #gem 'net-ssh', '~>2.7.0' # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index f75e498..d74d455 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,34 +8,33 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) + actionmailer (4.0.13) + actionpack (= 4.0.13) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0) - activesupport (= 4.0.0) + activemodel (4.0.13) + activesupport (= 4.0.13) builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) + activerecord (4.0.13) + activemodel (= 4.0.13) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) + activesupport (= 4.0.13) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) - i18n (~> 0.6, >= 0.6.4) + activerecord-deprecated_finders (1.0.4) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) acts_as_tree (1.4.0) activerecord (>= 3.0.0) - arel (4.0.0) - atomic (1.1.10) + arel (4.0.2) bcrypt-ruby (3.0.1) builder (3.1.4) capistrano (2.15.5) @@ -55,7 +54,8 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - commonjs (0.2.6) + commonjs (0.2.7) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) @@ -67,9 +67,9 @@ GEM haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) highline (1.6.19) - hike (1.2.3) htmlentities (4.3.1) - i18n (0.6.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.0.2) activesupport (>= 3.0.0) jquery-rails (3.0.4) @@ -83,19 +83,19 @@ GEM kaminari (>= 0.13.0) rails kgio (2.11.2) - less (2.3.2) - commonjs (~> 0.2.6) - less-rails (2.3.3) - actionpack (>= 3.1) - less (~> 2.3.1) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) libv8 (3.11.8.17) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) + mail (2.7.1) + mini_mime (>= 0.1.1) + mini_mime (1.0.2) mini_portile (0.5.1) minitest (4.7.5) - multi_json (1.7.7) + multi_json (1.13.1) mysql2 (0.3.21) net-scp (1.1.2) net-ssh (>= 2.6.5) @@ -106,25 +106,24 @@ GEM net-ssh (>= 2.6.5) nokogiri (1.6.0) mini_portile (~> 0.5.0) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.0.13) + actionmailer (= 4.0.13) + actionpack (= 4.0.13) + activerecord (= 4.0.13) + activesupport (= 4.0.13) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) - sprockets-rails (~> 2.0.0) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + railties (= 4.0.13) + sprockets-rails (~> 2.0) + railties (4.0.13) + actionpack (= 4.0.13) + activesupport (= 4.0.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) - rake (10.1.0) + rake (12.3.3) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) @@ -134,25 +133,19 @@ GEM sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - sprockets (2.10.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref - thor (0.18.1) - thread_safe (0.1.0) - atomic - tilt (1.4.1) - treetop (1.4.14) - polyglot - polyglot (>= 0.3.1) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) turbolinks (1.3.0) coffee-rails twitter-bootstrap-rails (2.2.7) @@ -160,7 +153,7 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.37) + tzinfo (0.3.55) uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -187,7 +180,7 @@ DEPENDENCIES less-rails mysql2 nokogiri - rails (= 4.0.0) + rails (= 4.0.13) rmagick rvm-capistrano sdoc diff --git a/app/models/block.rb b/app/models/block.rb index 1accc54..ee45f8f 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -19,7 +19,7 @@ class Block < ActiveRecord::Base belongs_to :blockable, :polymorphic => true - has_many :portlets, :order => :position, :dependent => :destroy + has_many :portlets,:dependent => :destroy accepts_nested_attributes_for :portlets diff --git a/app/views/public/blocks/_block.html.haml b/app/views/public/blocks/_block.html.haml index bf565ed..a8d17d5 100644 --- a/app/views/public/blocks/_block.html.haml +++ b/app/views/public/blocks/_block.html.haml @@ -1,5 +1,5 @@ .row-fluid - -block.portlets.each do |p| + -block.portlets.order(:position).each do |p| -if p.content_type =render :partial => "portlets/render_public/"+p.content_type.to_s.downcase, :locals => {:admin => false,:input => p.content} \ No newline at end of file