#699 add activity lines links

ulmic · Jun 11, 2017 · ef485f8 · ef485f8
1 parent 8a69b5b
commit ef485f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/controllers/web/application_controller.rb b/app/controllers/web/application_controller.rb
@@ -34,10 +34,10 @@ def load_categories_tree
     @first_category = Category.includes(:articles).find configus.categories.who_we_are
     @about_site_category = Category.includes(:articles).find configus.categories.site_mic
     @corporative_category = Category.includes(:articles).find configus.categories.corporative_projects
-    @report_category = Category.includes(:articles).find 18
     if signed_in?
       @korporative_category = Category.find configus.categories.corporative_projects
     end
+    @activity_lines = ActivityLine.official.decorate
     @feedback = FeedbackForm.new_with_model
     @rss_article_id = 19
   end

diff --git a/app/models/activity_line.rb b/app/models/activity_line.rb
@@ -40,6 +40,7 @@ class ActivityLine < ActiveRecord::Base
   scope :has_curators, -> { where.not(activity_type: :event_line) }
   scope :ulmic, -> { where organization_type: :ulmic }
   scope :need_to_review, -> { where 'state = \'unviewed\' OR state = \'updated\'' }
+  scope :official, -> { active.where(organization_type: :ulmic, activity_type: [:central_program, :local_project]).order(activity_type: :asc) }
 
   include TagsHelper
   include PgSearch

diff --git a/app/views/layouts/web/shared/_navbar.html.haml b/app/views/layouts/web/shared/_navbar.html.haml
@@ -69,13 +69,11 @@
                       = @corporative_category.name
                     - @corporative_category.articles.visible.confirmed.each do |article|
                       = link_to article.title, article_path(article)
-                - if @report_category.present?
-                  .category-column
-                    .menu-title
-                      = @report_category.name
-                    - [132, 133, 135, 134].each do |id|
-                      - article = Article.find(id)
-                      = link_to article.title, article_path(article)
+                .category-column
+                  .menu-title
+                    = t('activerecord.models.activity_line').pluralize(:ru)
+                  - @activity_lines.each do |activity_line|
+                    = link_to activity_line.title, activity_line_path(activity_line)
           %li{ style: 'margin-right: 15px' }
             - if signed_in? && current_user.state == 'confirmed'
               = link_to '#', data: { 'reveal-id' => 'feedbackModal' } do