diff options
| author | erdgeist <erdgeist@bauklotz.local> | 2009-03-10 19:59:02 +0100 |
|---|---|---|
| committer | erdgeist <erdgeist@bauklotz.local> | 2009-03-10 19:59:02 +0100 |
| commit | d6049aeffc7de43393a9a7a1d2f95f26422a046f (patch) | |
| tree | 7036f509aa4f4a518a00ddb0e12fe8a6eb4d563a /app/models/node.rb | |
| parent | 3b3158199f147646348fae0008d3f63062967a87 (diff) | |
| parent | 14ada6b405dac2bea27a2959f6f73a7398776b0b (diff) | |
Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms
Diffstat (limited to 'app/models/node.rb')
| -rw-r--r-- | app/models/node.rb | 5 |
1 files changed, 1 insertions, 4 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 | |||
| 59 | def create_new_draft user | 59 | def create_new_draft user |
| 60 | empty_page = self.pages.new | 60 | empty_page = self.pages.new |
| 61 | empty_page.user = user | 61 | empty_page.user = user |
| 62 | |||
| 63 | empty_page.clone_attributes_from self.head | 62 | empty_page.clone_attributes_from self.head |
| 64 | 63 | ||
| 65 | self.draft = empty_page | 64 | self.draft = empty_page |
| @@ -70,11 +69,9 @@ class Node < ActiveRecord::Base | |||
| 70 | def publish_draft! | 69 | def publish_draft! |
| 71 | if self.draft | 70 | if self.draft |
| 72 | self.head = self.draft | 71 | self.head = self.draft |
| 72 | self.head.save! | ||
| 73 | self.draft = nil | 73 | self.draft = nil |
| 74 | self.save! | 74 | self.save! |
| 75 | |||
| 76 | self.head.published_at = Time.now | ||
| 77 | self.head.save! | ||
| 78 | else | 75 | else |
| 79 | nil | 76 | nil |
| 80 | end | 77 | end |