diff options
| author | simon <simon@zagal.(none)> | 2009-02-12 00:02:39 +0100 |
|---|---|---|
| committer | hukl <hukl@eight.local> | 2009-02-15 20:22:17 +0100 |
| commit | f10e79a554bd0666de6390c4bc34b52c8ecd936d (patch) | |
| tree | 29c19fe5cbfa8ad8d4ee08639ad9689c8268c60c /app/models | |
| parent | b700b1315afa9b77104cf30ca1aff0c4a33b029d (diff) | |
* removed the auditing observer, we'll do it the old fashioned way
* added permission model
* locked down attributes on page model
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/auditing_observer.rb | 8 | ||||
| -rw-r--r-- | app/models/node.rb | 4 | ||||
| -rw-r--r-- | app/models/page.rb | 5 | ||||
| -rw-r--r-- | app/models/permission.rb | 10 |
4 files changed, 16 insertions, 11 deletions
diff --git a/app/models/auditing_observer.rb b/app/models/auditing_observer.rb deleted file mode 100644 index acce18c..0000000 --- a/app/models/auditing_observer.rb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | class AuditingObserver < Auditing::Observer | ||
| 2 | observe :node, :page | ||
| 3 | |||
| 4 | # TODO: Insert super secure auditing here | ||
| 5 | def before_save(record) | ||
| 6 | RAILS_DEFAULT_LOGGER.debug ">>>>>>>>>>>>> #{controller.inspect}" | ||
| 7 | end | ||
| 8 | end | ||
diff --git a/app/models/node.rb b/app/models/node.rb index 05da907..819acac 100644 --- a/app/models/node.rb +++ b/app/models/node.rb | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | class Node < ActiveRecord::Base | 1 | class Node < ActiveRecord::Base |
| 2 | acts_as_nested_set | 2 | acts_as_nested_set |
| 3 | 3 | ||
| 4 | # Associations | ||
| 4 | has_many :pages, :order => "revision ASC" | 5 | has_many :pages, :order => "revision ASC" |
| 5 | belongs_to :head, :class_name => "Page", :foreign_key => :head_id | 6 | belongs_to :head, :class_name => "Page", :foreign_key => :head_id |
| 6 | 7 | ||
| 7 | # Callbacks | 8 | # Callbacks |
| 8 | |||
| 9 | after_create :initialize_empty_page | 9 | after_create :initialize_empty_page |
| 10 | 10 | ||
| 11 | # Class methods | 11 | # Class methods |
diff --git a/app/models/page.rb b/app/models/page.rb index 5647ef9..aba974a 100644 --- a/app/models/page.rb +++ b/app/models/page.rb | |||
| @@ -9,7 +9,10 @@ class Page < ActiveRecord::Base | |||
| 9 | # Associations | 9 | # Associations |
| 10 | belongs_to :node | 10 | belongs_to :node |
| 11 | belongs_to :user | 11 | belongs_to :user |
| 12 | 12 | ||
| 13 | # Security | ||
| 14 | attr_accessible :title, :abstract, :body | ||
| 15 | |||
| 13 | # Class Methods | 16 | # Class Methods |
| 14 | 17 | ||
| 15 | # This method is most likely called from the ContentHelper.render_collection | 18 | # This method is most likely called from the ContentHelper.render_collection |
diff --git a/app/models/permission.rb b/app/models/permission.rb new file mode 100644 index 0000000..1070b7a --- /dev/null +++ b/app/models/permission.rb | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | class Permission < ActiveRecord::Base | ||
| 2 | validates_presence_of :user_id, :node_id, :granted | ||
| 3 | |||
| 4 | # Associations | ||
| 5 | belongs_to :user | ||
| 6 | belongs_to :node | ||
| 7 | |||
| 8 | # Security | ||
| 9 | attr_protected :user_id, :node_id, :granted # Allow no mass assignments | ||
| 10 | end | ||
