Merge branch 'master' of github.com:noesya/osuny

app/models/communication/website/category.rb

@@ -32,6 +32,7 @@
 #
 class Communication::Website::Category < ApplicationRecord
   include WithGithubFiles
+  include WithMenuItemTarget
   include WithSlug
   include WithTree
 

app/models/communication/website/page.rb

@@ -39,15 +39,13 @@
 class Communication::Website::Page < ApplicationRecord
   include Communication::Website::WithMedia
   include WithGithubFiles
+  include WithMenuItemTarget
   include WithSlug
   include WithTree
 
   has_rich_text :text
   has_one_attached_deletable :featured_image
 
-  has_one :imported_page,
-          class_name: 'Communication::Website::Imported::Page',
-          dependent: :destroy
   belongs_to :university
   belongs_to :website,
              foreign_key: :communication_website_id
@@ -57,13 +55,14 @@ class Communication::Website::Page < ApplicationRecord
   belongs_to :parent,
              class_name: 'Communication::Website::Page',
              optional: true
+  has_one    :imported_page,
+             class_name: 'Communication::Website::Imported::Page',
+             dependent: :nullify
   has_many   :children,
              class_name: 'Communication::Website::Page',
              foreign_key: :parent_id,
              dependent: :nullify
-  has_one    :imported_page,
-             class_name: 'Communication::Website::Imported::Page',
-             dependent: :nullify
+
 
   validates :title, presence: true
   validates :slug, uniqueness: { scope: :communication_website_id }

app/models/communication/website/post.rb

@@ -31,6 +31,7 @@
 class Communication::Website::Post < ApplicationRecord
   include Communication::Website::WithMedia
   include WithGithubFiles
+  include WithMenuItemTarget
   include WithSlug
 
   has_rich_text :text

app/models/concerns/with_menu_item_target.rb

+module WithMenuItemTarget
+  extend ActiveSupport::Concern
+
+  included do
+    has_many   :menu_items,
+               as: :about,
+               class_name: 'Communication::Website::Menu::Item',
+               dependent: :destroy
+
+  end
+end

app/models/education/program.rb

@@ -28,6 +28,7 @@
 #
 class Education::Program < ApplicationRecord
   include WithGithubFiles
+  include WithMenuItemTarget
   include WithTree
 
   attr_accessor :skip_websites_categories_callback

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

@@ -16,7 +16,11 @@
           <h5 class="card-title mb-0"><%= t('metadata') %></h5>
         </div>
         <div class="card-body">
-          <%= f.input :identifier if can?(:create, menu) %>
+          <%= f.input :identifier,
+              input_html: menu.persisted? ? {} : {
+                class: 'js-slug-input',
+                data: { source: '#communication_website_menu_title' }
+              } if can?(:create, menu) %>
         </div>
       </div>
     </div>