biovision-post 0.26.191013.0 → 0.28.191126.0

data/app/views/posts/_list.jbuilder

@@ -2,7 +2,7 @@ json.data collection do |entity|
   json.id entity.id
   json.type entity.class.table_name
   json.attributes do
-    json.call(entity, :title, :lead, :post_category_id)
+    json.call(entity, :title, :lead)
   end
   json.meta do
     json.html_preview render(partial: 'posts/preview', formats: [:html], locals: { entity: entity })

data/app/views/posts/form/_category_links.html.erb

@@ -2,13 +2,17 @@
   <ul class="post-category-tree">
     <% collection.each do |category_id, item| %>
       <li>
-        <% element_id = "post_category_#{category_id}" %>
+        <%
+          element_id = "post_category_#{category_id}"
+          allowed = handler.allow_post_category?(category_id)
+        %>
         <%=
           check_box_tag(
               "post_category_ids[]",
               category_id,
               item[:item].post?(entity),
-              id: element_id
+              id: element_id,
+              disabled: !allowed
           )
         %>
         <%= label_tag element_id, item[:item].name %>
@@ -19,9 +23,10 @@
             render(
                 partial: 'posts/form/category_links',
                 locals: {
-                    entity: entity,
+                    categories: categories,
                     collection: children,
-                    categories: categories
+                    entity: entity,
+                    handler: handler
                 }
             )
           %>

data/config/locales/posts-ru.yml

@@ -304,6 +304,10 @@ ru:
       entity:
         in_list:
           post_categories: "Категории публикаций"
+    components:
+      user_settings:
+        posts:
+          heading: "Разрешённые типы и категории"
   biovision:
     components:
       posts:

data/config/routes.rb

@@ -91,10 +91,17 @@ Rails.application.routes.draw do
           get :new_post
           get :post_tags
           get :authors
+          put 'users/:user_id' => :add_user, as: :user
+          delete 'users/:user_id' => :remove_user
         end
       end
 
-      resources :post_categories, only: :show, concerns: %i[toggle priority]
+      resources :post_categories, only: :show, concerns: %i[toggle priority] do
+        member do
+          put 'users/:user_id' => :add_user, as: :user
+          delete 'users/:user_id' => :remove_user
+        end
+      end
 
       resources :posts, only: %i[index show], concerns: %i[lock toggle] do
         get 'search', on: :collection

data/db/migrate/20191124232323_convert_editorial_privileges.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Convert editorial_member_post_types to component settings
+class ConvertEditorialPrivileges < ActiveRecord::Migration[5.2]
+  def up
+    slug = Biovision::Components::PostsComponent::SLUG
+    handler = Biovision::Components::BaseComponent.handler(slug)
+    EditorialMemberPostType.order('id asc').each do |link|
+      handler.user = link.editorial_member.user
+      handler.allow_post_type(link.post_type)
+    end
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/post/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Post
-    VERSION = '0.26.191013.0'
+    VERSION = '0.28.191126.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-post
 version: !ruby/object:Gem::Version
-  version: 0.26.191013.0
+  version: 0.28.191126.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,8 @@ files:
 - app/services/post_parser.rb
 - app/uploaders/post_image_uploader.rb
 - app/views/admin/components/links/_posts.html.erb
+- app/views/admin/components/user_settings/_posts.html.erb
+- app/views/admin/components/user_settings/posts/_post_categories.html.erb
 - app/views/admin/editorial_members/_nav_item.html.erb
 - app/views/admin/editorial_members/entity/_in_list.html.erb
 - app/views/admin/editorial_members/index.html.erb
@@ -357,6 +359,7 @@ files:
 - db/migrate/20190801161616_add_posts_component.rb
 - db/migrate/20190822121212_create_post_attachments.rb
 - db/migrate/20190914212121_convert_post_privileges.rb
+- db/migrate/20191124232323_convert_editorial_privileges.rb
 - lib/biovision/post.rb
 - lib/biovision/post/engine.rb
 - lib/biovision/post/version.rb