Skip to content

Commit

Permalink
Rapid - <with-fields> now skips deleted_at by defatult
Browse files Browse the repository at this point in the history
  • Loading branch information
tslocke committed Jun 24, 2008
1 parent 669ee54 commit 6a07948
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hobo/taglibs/rapid_support.dryml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
elsif fields.nil? || fields == "*" || fields.is_a?(Class)
klass = fields.is_a?(Class) ? fields : this.class
columns = klass.content_columns.*.name
columns -= %w{created_at updated_at created_on updated_on} unless include_timestamps
columns -= %w{created_at updated_at created_on updated_on deleted_at} unless include_timestamps

if skip_associations == "has_many"
assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
Expand Down Expand Up @@ -36,7 +36,7 @@
field_names = if fields.nil? || fields == "*" || fields.is_a?(Class)
klass = fields.is_a?(Class) ? fields : this.member_class
columns = klass.content_columns.*.name
columns -= %w{created_at updated_at created_on updated_on} unless include_timestamps
columns -= %w{created_at updated_at created_on updated_on deleted_at} unless include_timestamps

if skip_associations == "has_many"
assocs = this.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
Expand Down

0 comments on commit 6a07948

Please sign in to comment.