Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms

2 files changed, 33 insertions, 39 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 7f2bca6..d2db4ba 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -59,7 +59,6 @@ class Node < ActiveRecord::Base
   def create_new_draft user
     empty_page = self.pages.new
     empty_page.user = user
-    
     empty_page.clone_attributes_from self.head
     
     self.draft = empty_page
@@ -70,11 +69,9 @@ class Node < ActiveRecord::Base
   def publish_draft!
     if self.draft
       self.head = self.draft
+      self.head.save!
       self.draft = nil
       self.save!
-      
-      self.head.published_at = Time.now
-      self.head.save!
     else
       nil
     end
diff --git a/app/models/page.rb b/app/models/page.rb
index a4817a3..af820e3 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,3 +1,5 @@
+require 'xml'
+
 class Page < ActiveRecord::Base
   
   PUBLIC_TEMPLATE_PATH = File.join(%w(custom page_templates public))
@@ -17,7 +19,7 @@ class Page < ActiveRecord::Base
   before_save :rewrite_links_in_body
   
   # Security
-  attr_accessible :title, :abstract, :body, :template_name
+  attr_accessible :title, :abstract, :body, :template_name, :published_at
   
   # Class Methods
   
@@ -57,24 +59,6 @@ class Page < ActiveRecord::Base
   end
   
   # Instance Methods
-  
-  def clone_attributes_from page
-    return nil unless page
-  
-    self.tag_list = page.tag_list.join(", ")
-    
-    locale_before = I18n.locale
-    
-    I18n.available_locales.each do |l|
-      next if l == :root
-      I18n.locale = l
-      self.title    = page.title
-      self.abstract = page.abstract
-      self.body     = page.body
-    end
-  
-    I18n.locale = locale_before
-  end
 
   def public_template_path
     File.join(PUBLIC_TEMPLATE_PATH, template_name)
@@ -104,8 +88,13 @@ class Page < ActiveRecord::Base
   def clone_attributes_from page
     return nil unless page
   
+    # Clone untranslated attributes
+  
     self.tag_list = page.tag_list.join(", ")
     self.template_name = page.template_name
+    self.published_at = page.published_at
+    
+    # Clone translated attributes
     
     locale_before = I18n.locale
     
@@ -120,27 +109,35 @@ class Page < ActiveRecord::Base
     I18n.locale = locale_before
   end
   
+  def public?
+    published_at.nil? ? true : published_at < Time.now 
+  end
+  
   private
     
     def rewrite_links_in_body
-      if self.body
-        tmp_body = "<div>#{self.body}</div>"
-        xml_string = XML::Parser.string( tmp_body )
-        xml_doc = xml_string.parse
-        links = xml_doc.find("a[not(starts-with(@href, 'http://'))]")
-        
-        locales = I18n.available_locales.reject {|l| l == :root}
-        
-        links.each do |link|
-          unless locales.include? link[:href].slice(1,2).to_sym
-            link[:href] = link[:href].sub(/^\//, "/#{I18n.locale}/")
+      begin
+        if self.body
+          tmp_body = "<div>#{self.body}</div>"
+          xml_string = XML::Parser.string( tmp_body )
+          xml_doc = xml_string.parse
+          links = xml_doc.find("//a[not(starts-with(@href, 'http://'))]")
+          
+          locales = I18n.available_locales.reject {|l| l == :root}
+          
+          links.each do |link|
+            unless locales.include? link[:href].slice(1,2).to_sym
+              link[:href] = link[:href].sub(/^\//, "/#{I18n.locale}/")
+            end
           end
+          
+          tmp_body = xml_doc.to_s.gsub(/(\n\<div\>|\<\/div\>\n)/, "")
+          tmp_body.gsub!("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "")
+          
+          self.body = tmp_body
         end
-        
-        tmp_body = xml_doc.to_s.gsub(/(\n\<div\>|\<\/div\>\n)/, "")
-        tmp_body.gsub!("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "")
-        
-        self.body = tmp_body
+      rescue
+        nil
       end
     end