From e04151525fa6963f2e55444a156fd47f24423e51 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Thu, 26 Feb 2009 14:16:57 +0100
Subject: the locale stuff as well as the cloning should work now entirely as
 expected although the cloning itself isn't really a beauty

---
 app/controllers/nodes_controller.rb | 2 +-
 app/models/page.rb                  | 7 -------
 app/views/nodes/edit.html.erb       | 5 ++---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index e698ebc..9ba91f6 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -42,7 +42,7 @@ class NodesController < ApplicationController
   end
 
   def edit
-    
+    @draft = @node.find_or_create_draft( current_user )
   end
 
   def update
diff --git a/app/models/page.rb b/app/models/page.rb
index ea481a6..aba974a 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -38,12 +38,5 @@ class Page < ActiveRecord::Base
       :order => "#{options[:order_by]} #{options[:order_direction]}")
   end
   
-  def self.with_locale l, &block
-    old_locale = self.locale
-    self.locale = l
-    yield
-    self.locale = old_locale
-  end
-  
   # Instance Methods
 end
\ No newline at end of file
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index e2c0965..64d4756 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -12,8 +12,7 @@
   <% form_for(@node) do |f| %>
     <%= f.error_messages %>
     
-    <% draft = @node.find_or_create_draft( current_user ) %>
-    <% fields_for draft do |d| %>
+    <% fields_for @draft do |d| %>
     <p></p>
     <p>
       <%= d.label :title %><br />
@@ -21,7 +20,7 @@
     </p>
     <p>
        <%= d.label 'Tags, comma sperated' %><br />
-       <%= text_field_tag :tag_list, draft.tag_list.join(", ") %>
+       <%= text_field_tag :tag_list, @draft.tag_list.join(", ") %>
     </p>
     <p>
       <%= d.label :abstract %><br />
-- 
cgit v1.3