Merge branch 'git' of github.com:noesya/osuny into git

app/controllers/admin/communication/website/menu/items_controller.rb

@@ -13,7 +13,7 @@ class Admin::Communication::Website::Menu::ItemsController < Admin::Communicatio
         skip_publication_callback: true
       )
     end
-    @menu.force_publish!
+    @menu.sync_with_git
   end
 
   def show

app/helpers/admin/application_helper.rb

@@ -72,12 +72,13 @@ module Admin::ApplicationHelper
     sanitize text
   end
 
-  def collection_tree(list, except)
+  def collection_tree(list, except = nil)
     collection = []
     list.root.ordered.each do |object|
       collection.concat(object.self_and_children(0))
     end
-    collection.reject { |o| o[:id] == except.id }
+    collection = collection.reject { |o| o[:id] == except.id } unless except.nil?
+    collection
   end
 
   private

app/models/communication/website.rb

@@ -41,22 +41,6 @@ class Communication::Website < ApplicationRecord
     "#{name}"
   end
 
-  def list_of_categories
-    all_categories = []
-    categories.root.ordered.each do |category|
-      all_categories.concat(category.self_and_children(0))
-    end
-    all_categories
-  end
-
-  def list_of_programs
-    all_programs = []
-    programs.root.ordered.each do |program|
-      all_programs.concat(program.self_and_children(0))
-    end
-    all_programs
-  end
-
   def git_path_static
     "data/website.yml"
   end

app/models/communication/website/category.rb

@@ -70,11 +70,6 @@ class Communication::Website::Category < ApplicationRecord
 
   before_create :set_position
 
-  def list_of_other_categories
-    new_record? ? website.list_of_categories
-                : website.list_of_categories.reject! { |p| p[:id] == id }
-  end
-
   def to_s
     "#{name}"
   end

app/models/communication/website/menu.rb

@@ -40,8 +40,4 @@ class Communication::Website::Menu < ApplicationRecord
   def git_path_static
     "data/menus/#{identifier}.yml"
   end
-
-  def to_static(github_file)
-    items.root.ordered.map(&:to_static_hash).to_yaml
-  end
 end

app/models/communication/website/menu/item.rb

@@ -62,7 +62,7 @@ class Communication::Website::Menu::Item < ApplicationRecord
   validates :about, presence: true, if: :has_about?
 
   before_create :set_position
-  after_commit :force_publish_menu, unless: :skip_publication_callback
+  after_commit :sync_menu
 
   scope :ordered, -> { order(position: :asc) }
 
@@ -115,8 +115,8 @@ class Communication::Website::Menu::Item < ApplicationRecord
     kind_page? || kind_program? || kind_news_category? || kind_news_article?
   end
 
-  def force_publish_menu
-    menu.force_publish!
+  def sync_menu
+    menu.sync_with_git
   end
 
   def siblings
@@ -127,11 +127,7 @@ class Communication::Website::Menu::Item < ApplicationRecord
 
   def set_position
     last_element = menu.items.where(parent_id: parent_id).ordered.last
-
-    unless last_element.nil?
-      self.position = last_element.position + 1
-    else
-      self.position = 1
-    end
+    self.position = last_element.nil? ? 1
+                                      : last_element.position + 1
   end
 end

app/models/education/program.rb

@@ -122,10 +122,6 @@ class Education::Program < ApplicationRecord
     end
   end
 
-  def list_of_other_programs
-    university.list_of_programs.reject! { |p| p[:id] == id }
-  end
-
   def set_websites_categories
     websites.find_each(&:set_programs_categories!)
   end

app/models/university/with_education.rb

@@ -4,14 +4,5 @@ module University::WithEducation
   included do
     has_many :education_programs, class_name: 'Education::Program', dependent: :destroy
     has_many :education_schools, class_name: 'Education::School', dependent: :destroy
-
-    def list_of_programs
-      all_programs = []
-      education_programs.root.ordered.each do |program|
-        all_programs.concat(program.self_and_children(0))
-      end
-      all_programs
-    end
-
   end
 end

app/views/admin/communication/website/menu/items/_form.html.erb

@@ -21,11 +21,11 @@
             <%
               if item.has_about?
                 if item.kind_page?
-                  about_collection = @website.list_of_pages
+                  about_collection = collection_tree(@website.pages)
                 elsif item.kind_program?
-                  about_collection = @website.list_of_programs
+                  about_collection = collection_tree(@website.programs)
                 elsif item.kind_news_category?
-                  about_collection = @website.list_of_categories
+                  about_collection = collection_tree(@website.categories)
                 elsif item.kind_news_article?
                   about_collection = @website.posts.ordered.map { |e| { label: e.to_s, id: e.id } }
                 end

app/views/admin/communication/website/menu/items/kind_switch.js.erb

@@ -14,16 +14,16 @@ function hideAbout() {
     hideAbout();
 <% elsif @kind == 'page' %>
     <%
-        options = ['<option value="" label=" "></option>']
-        @website.list_of_pages.each do |page|
-            options << "<option value=\"#{page[:id]}\">#{page[:label]}</option>"
-        end
+    options = ['<option value="" label=" "></option>']
+    collection_tree(@website.pages).each do |page|
+        options << "<option value=\"#{page[:id]}\">#{page[:label]}</option>"
+    end
     %>
     displayAbout('Communication::Website::Page', "<%= j(raw(options.join(''))) %>");
 <% elsif @kind == 'program' %>
     <%
     options = ['<option value="" label=" "></option>']
-    @website.list_of_programs.each do |page|
+    collection_tree(@website.programs).each do |page|
         options << "<option value=\"#{page[:id]}\">#{page[:label]}</option>"
     end
     %>
@@ -31,17 +31,17 @@ function hideAbout() {
 <% elsif @kind == 'news_category' %>
     <%
         options = ['<option value="" label=" "></option>']
-        @website.list_of_categories.each do |category|
+        collection_tree(@website.categories).each do |category|
             options << "<option value=\"#{category[:id]}\">#{category[:label]}</option>"
         end
     %>
     displayAbout('Communication::Website::Category', "<%= j(raw(options.join(''))) %>");
 <% elsif @kind == 'news_article' %>
     <%
-        options = ['<option value="" label=" "></option>']
-        @website.posts.ordered.each do |post|
-            options << "<option value=\"#{post.id}\">#{post.to_s}</option>"
-        end
+    options = ['<option value="" label=" "></option>']
+    @website.posts.ordered.each do |post|
+        options << "<option value=\"#{post.id}\">#{post.to_s}</option>"
+    end
     %>
     displayAbout('Communication::Website::Post', "<%= j(raw(options.join(''))) %>");
 <% else %>

app/views/admin/communication/website/menus/static.html.erb

+<%= raw @menu.items
+             .root
+             .ordered
+             .map(&:to_static_hash)
+             .to_yaml %>

app/views/admin/communication/website/pages/_form.html.erb

@@ -10,7 +10,7 @@
           <%= f.input :description %>
           <%= f.input :text, as: :rich_text_area %>
           <%= f.association :related_category,
-                            collection: @website.list_of_categories,
+                            collection: collection_tree(@website.categories),
                             label_method: ->(p) { sanitize p[:label] },
                             value_method: ->(p) { p[:id] } if @website.categories.any? %>
         </div>
@@ -30,7 +30,7 @@
                       } %>
           <%= f.input :published %>
           <%= f.association :parent,
-                            collection: collection_tree(page.website.pages, page),
+                            collection: collection_tree(@website.pages, page),
                             label_method: ->(p) { sanitize p[:label] },
                             value_method: ->(p) { p[:id] } %>
           <ul>

app/views/admin/communication/website/posts/_form.html.erb

@@ -30,7 +30,7 @@
           <%= f.association :author, collection: current_university.administration_members.authors.ordered %>
           <%= f.association :categories,
                             as: :check_boxes,
-                            collection: @website.list_of_categories.map { |category| [
+                            collection: collection_tree(@website.categories).map { |category| [
                               sanitize(category[:label]),
                               category[:id],
                               { data: { parent: category[:parent_id] } }

app/views/admin/education/programs/_form.html.erb

@@ -22,7 +22,7 @@
                             as: :check_boxes,
                             collection: current_university.education_schools.ordered %>
           <%= f.association :parent,
-                            collection: program.persisted? ? program.list_of_other_programs : current_university.list_of_programs,
+                            collection: collection_tree(current_university.programs, program),
                             label_method: ->(p) { sanitize p[:label] },
                             value_method: ->(p) { p[:id] } %>
         </div>

app/views/admin/education/schools/_form.html.erb

@@ -29,7 +29,7 @@
         <div class="card-body">
           <%= f.association :programs,
                             as: :check_boxes,
-                            collection: current_university.list_of_programs,
+                            collection: collection_tree(current_university.education_programs,
                             label_method: ->(p) { sanitize p[:label] },
                             value_method: ->(p) { p[:id] }  %>
         </div>

app/views/admin/education/teachers/_form.html.erb

@@ -7,7 +7,7 @@
       <%= f.association :education_programs,
                         as: :check_boxes,
                         legend_tag: false,
-                        collection: current_university.list_of_programs,
+                        collection: collection_tree(current_university.education_programs),
                         label_method: ->(p) { sanitize p[:label] },
                         value_method: ->(p) { p[:id] }  %>
     </div>

app/views/admin/education/teachers/_list.html.erb

@@ -9,7 +9,8 @@
   <tbody>
     <% teachers.each do |teacher| %>
       <tr>
-        <td><%= link_to teacher, admin_education_teacher_path(teacher) %></td>
+        <td><%= link_to teacher.last_name, admin_education_teacher_path(teacher) %></td>
+        <td><%= link_to teacher.first_name, admin_education_teacher_path(teacher) %></td>
         <td class="text-end">
           <div class="btn-group" role="group">
             <%= link_to t('edit'),