github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to fix cucumber tests

Browse Source
This commit is contained in:
Didier Lafforgue 2012-05-26 15:21:47 +02:00
parent da2d689bdc
commit ae16661286
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@ -189,7 +189,6 @@ GEM
jquery-rails (1.0.19) jquery-rails (1.0.19)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
jruby-pageant (1.0.2)
json (1.7.3) json (1.7.3)
json_spec (1.0.3) json_spec (1.0.3)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -227,8 +226,7 @@ GEM
multi_xml (0.5.1) multi_xml (0.5.1)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.5.1) net-ssh (2.5.2)
jruby-pageant (>= 1.0.2)
nokogiri (1.5.2) nokogiri (1.5.2)
orm_adapter (0.0.7) orm_adapter (0.0.7)
pickle (0.4.10) pickle (0.4.10)
@ -294,7 +292,7 @@ GEM
rubyzip (0.9.8) rubyzip (0.9.8)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
sass (3.1.18) sass (3.1.19)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)

2
app/controllers/locomotive/api/pages_controller.rb
View File

@ -3,7 +3,7 @@ module Locomotive
class PagesController < BaseController class PagesController < BaseController
def index def index
@pages = current_site.pages.all @pages = current_site.pages.order([:depth, :asc], [:position, :asc])
respond_with(@pages) respond_with(@pages)
end end

2
app/models/locomotive/extensions/page/tree.rb
View File

@ -26,7 +26,7 @@ module Locomotive
module ClassMethods module ClassMethods
# Returns the pages tree from the site with the most minimal amount of queries. # Returns the tree of pages from the site with the most minimal amount of queries.
# This method should only be used for read-only purpose since # This method should only be used for read-only purpose since
# the mongodb returns the minimal set of required attributes to build # the mongodb returns the minimal set of required attributes to build
# the tree. # the tree.