lots of relations changes for speed and version management

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index d729fdd456af3e38891bd8922560e830804c9462..a5da0099852657aa054fc26b7152a7d48a6aa495 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -436,12 +436,12 @@ class AmfController < ApplicationController
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then

-        rels.push([rel.id, rel.tags, rel.members])
+        rels.push([rel.id, rel.tags, rel.members, rel.version])

       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then
       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then

-             rels.push([t.relation.id, t.relation.tags, t.relation.members])
+             rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])

            end
          end
        end
            end
          end
        end

diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 20112747a9dc2eef3c462aa8550e5b03871242d2..0e81838fb348cd4d62af17d1250d16a4274cee1e 100755 (executable)
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ