Skip to content

Commit

Permalink
All tests pass
Browse files Browse the repository at this point in the history
  • Loading branch information
gaspard committed Jun 30, 2012
1 parent 88f631b commit 0e0b661
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions app/models/relation_proxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ def find_by_role(role, source_kpath = nil)
# Find a relation proxy for a role through a given node.
# The finder makes sure the class path is compatible with the node's class/virtual_class given as parameter.
def get_proxy(node, role)
# TODO: use find_by_role(role, node.kpath) when all tests are clear
rel = find_by_role(role, node.kpath)
rel = find_by_role(role, node.new_record? ? nil : node.kpath)
if rel && (node.new_record? || node.kpath =~ /\A#{rel.this_kpath}/)
rel.start = node
rel
Expand Down
7 changes: 3 additions & 4 deletions zena.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Gaspard Bucher"]
s.date = %q{2012-06-27}
s.date = %q{2012-06-30}
s.default_executable = %q{zena}
s.description = %q{zena is a Ruby on Rails CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
s.email = %q{gaspard@teti.ch}
Expand Down Expand Up @@ -395,6 +395,7 @@ Gem::Specification.new do |s|
"bricks/zena/zena/migrate/20110710113731_remove_icon_field.rb",
"bricks/zena/zena/migrate/20111101103900_add_comment_to_columns.rb",
"bricks/zena/zena/migrate/20111214112233_add_comment_to_relations.rb",
"bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb",
"config/boot.rb",
"config/bricks.yml",
"config/database_example.yml",
Expand Down Expand Up @@ -632,11 +633,8 @@ Gem::Specification.new do |s|
"lib/zena/loader/yaml_loader.rb",
"lib/zena/migrator.rb",
"lib/zena/parser.rb",
"lib/zena/parser/zafu_rules.rb",
"lib/zena/parser/zafu_tags.rb",
"lib/zena/parser/zazen_rules.rb",
"lib/zena/parser/zazen_tags.rb",
"lib/zena/parser/zena_rules.rb",
"lib/zena/refactor/act_as_content.rb",
"lib/zena/remote.rb",
"lib/zena/remote/connection.rb",
Expand Down Expand Up @@ -2036,6 +2034,7 @@ Gem::Specification.new do |s|
"test/selenium/Swap/swap2.rsel",
"test/selenium/Toggle/0setup.rsel",
"test/selenium/Toggle/toggle1.rsel",
"test/selenium/Toggle/toggle2.rsel",
"test/sites/README",
"test/sites/complex/columns.yml",
"test/sites/complex/complex.png",
Expand Down

0 comments on commit 0e0b661

Please sign in to comment.