Merge branch 'master' into notes
Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/site/index.html.erb
This commit is contained in:
commit
0037502426
190 changed files with 3488 additions and 2999 deletions
|
@ -1,7 +1,7 @@
|
|||
class DiaryEntry < ActiveRecord::Base
|
||||
belongs_to :user
|
||||
belongs_to :user, :counter_cache => true
|
||||
belongs_to :language, :foreign_key => 'language_code'
|
||||
|
||||
|
||||
has_many :comments, :class_name => "DiaryComment",
|
||||
:include => :user,
|
||||
:order => "diary_comments.id"
|
||||
|
|
|
@ -77,6 +77,12 @@ class Relation < ActiveRecord::Base
|
|||
relation.add_tag_keyval(tag['k'], tag['v'])
|
||||
end
|
||||
|
||||
# need to initialise the relation members array explicitly, as if this
|
||||
# isn't done for a new relation then @members attribute will be nil,
|
||||
# and the members will be loaded from the database instead of being
|
||||
# empty, as intended.
|
||||
relation.members = Array.new
|
||||
|
||||
pt.find('member').each do |member|
|
||||
#member_type =
|
||||
logger.debug "each member"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue