Merge branch 'release/0.14.4.2'

ulmic · Feb 1, 2017 · aa31c19 · aa31c19
2 parents e905159 + 09461ec
commit aa31c19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/models/article.rb b/app/models/article.rb
@@ -6,6 +6,7 @@ class Article < ActiveRecord::Base
   has_many :comments, as: :record,
                       dependent: :destroy
   has_many :page_views, class_name: 'View', as: :record
+  has_many :logged_actions, as: :record
 
   validates :title,       presence: true
   validates :category_id, presence: true

diff --git a/app/views/web/admin/articles/_form.html.haml b/app/views/web/admin/articles/_form.html.haml
@@ -22,3 +22,7 @@
       = f.association :attachments
       = f.button :submit, class: 'btn-success', value: t('helpers.links.save')
       = link_to t('helpers.links.back'), admin_articles_path, class: 'btn btn-default'
+
+.row
+  .col-md-12
+    = render 'web/admin/default/logged_actions', logged_actions: @article_form.model.logged_actions.reverse