Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/organizations/_org_activities.html.erb

@@ -46,7 +46,7 @@
                   </div>
                 </div>
             <% end %>
-            <% if act.org_act && act.org_act_type == 'OrgDocumentComment' && act.org_act.organization.home_id != act.org_act.id %>
+            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act && act.org_act.organization.home_id != act.org_act.id %>
                 <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>

lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb

@@ -10,11 +10,7 @@ module Redmine
         def acts_as_watchable(options = {})
           return if self.included_modules.include?(Redmine::Acts::Watchable::InstanceMethods)
           class_eval do
-            if self.name == 'User'
+            has_many :watchers, :as => :watchable, :dependent => :delete_all
-              has_many :watchers, :dependent => :delete_all
-            else
-              has_many :watchers, :as => :watchable, :dependent => :delete_all
-            end
             has_many :watcher_users, :through => :watchers, :source => :user, :validate => false
 
             scope :watched_by, lambda { |user_id|