biovision-base 0.39.190804.1 → 0.41.190905.0

data/app/views/tokens/edit.html.erb

@@ -1,8 +1,9 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to t('admin.tokens.nav_item.text'), admin_tokens_path %>
-    <%= admin_token_link(@entity) %>
-    <span><%= t(:edit) %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to t('admin.tokens.nav_item.text'), admin_tokens_path %>
+  <%= admin_token_link(@entity) %>
+  <span><%= t(:edit) %></span>
 <% end %>
 
 <article>

data/app/views/tokens/new.html.erb

@@ -1,7 +1,8 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to t('admin.tokens.nav_item.text'), admin_tokens_path %>
-    <span><%= t(:create) %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to t('admin.tokens.nav_item.text'), admin_tokens_path %>
+  <span><%= t(:create) %></span>
 <% end %>
 
 <article>

data/config/locales/components-en.yml

@@ -14,6 +14,8 @@ en:
         heading: "Компоненты"
       show:
         title: "Компонент %{slug}"
+      privileges:
+        nav_text: "Привилегии"
   biovision:
     components:
       contact:

data/config/locales/components-ru.yml

@@ -5,13 +5,26 @@ ru:
       biovision_parameter: "Параметр"
     attributes:
       biovision_component:
+        priority: "Порядок сортировки"
         slug: "Идентификатор"
+      biovision_component_user:
+        administrator: "Администратор компонента"
+        privileges:
+          settings: "Управление настройками"
   admin:
     components:
       index:
         title: "Компоненты"
         nav_text: "Компоненты"
         heading: "Компоненты"
+      privileges:
+        nav_text: "Привилегии"
+        title: "Настройки компонента «%{slug}»"
+        users:
+          heading: "Пользователи"
+        new_user:
+          heading: "Добавить пользователя"
+          added_users: "Добавленные пользователи"
       show:
         title: "Компонент %{slug}"
       settings:
@@ -36,8 +49,12 @@ ru:
         name: "Контакты"
         settings:
           feedback_receiver: "Адрес для сообщений через форму обратной связи"
+        privileges:
+          feedback_manager: "Менеджер обратной связи"
       content:
         name: "Контент"
+        privileges:
+          content_manager: "Контент-менеджер"
       registration:
         name: "Регистрация"
         settings:
@@ -51,3 +68,7 @@ ru:
         invalid_code: "указан неверно"
       users:
         name: "Пользователи"
+        privileges:
+          edit: "Редактирование"
+          manage_codes: "Управление кодами"
+          view: "Просмотр"

data/config/locales/users-ru.yml

@@ -321,8 +321,9 @@ ru:
   my:
     index:
       index:
-        title: "Личный кабинет"
         heading: "Личный кабинет"
+        nav_text: "Личный кабинет"
+        title: "Личный кабинет"
     recoveries:
       create:
         impossible: "Сброс пароля для этого пользователя недоступен"

data/config/routes.rb

@@ -84,6 +84,12 @@ Rails.application.routes.draw do
           get 'settings' => :settings, as: :component_settings
           patch 'settings' => :update_settings, as: nil
           patch 'parameters' => :update_parameter, as: :component_parameters
+          get 'privileges' => :privileges, as: :component_privileges
+          patch 'privileges' => :update_privileges, as: nil
+          put 'administrators/:user_id' => :add_administrator, as: :component_administrators
+          delete 'administrators/:user_id' => :remove_administrator, as: nil
+          put 'users/:user_id/privileges/:privilege_slug' => :add_privilege, as: :component_privilege
+          delete 'users/:user_id/privileges/:privilege_slug' => :remove_privilege, as: nil
         end
       end
 

data/db/migrate/20181217000000_create_biovision_components.rb

@@ -17,6 +17,7 @@ class CreateBiovisionComponents < ActiveRecord::Migration[5.2]
   def create_components_table
     create_table :biovision_components, comment: 'Biovision component' do |t|
       t.timestamps
+      t.integer :priority, limit: 2, default: 1, null: false
       t.string :slug, null: false
       t.jsonb :settings, null: false, default: {}
       t.jsonb :parameters, null: false, default: {}

data/db/migrate/20181217000040_create_privileges.rb

@@ -8,8 +8,6 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
     create_user_privileges unless UserPrivilege.table_exists?
     create_privilege_groups unless PrivilegeGroup.table_exists?
     create_privilege_group_links unless PrivilegeGroupPrivilege.table_exists?
-
-    seed_privileges
   end
 
   # Drop tables
@@ -29,6 +27,7 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
       t.integer :parent_id
       t.boolean :administrative, default: true, null: false
       t.boolean :deletable, default: true, null: false
+      t.boolean :regional, default: false, null: false
       t.integer :priority, limit: 2, default: 1, null: false
       t.integer :users_count, default: 0, null: false
       t.string :parents_cache, default: '', null: false
@@ -74,69 +73,4 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
       t.boolean :deletable, default: true, null: false
     end
   end
-
-  # Create initial privileges and groups
-  def seed_privileges
-    groups = {
-      administrators:   {
-        name:        'Администраторы',
-        description: 'Административная группа',
-        privileges:  {
-          administrator: ['Администратор', 'Может управлять пользователями и привилегиями.']
-        }
-      },
-      analysts:         {
-        name:        'Аналитики',
-        description: 'Группа аналитиков различных метрик сайта',
-        privileges:  {
-          mertics_manager: ['Аналитик метрик', 'Может просматривать метрики.']
-        }
-      },
-      moderators:       {
-        name:        'Модераторы',
-        description: 'Отвечает за пользовательский контент и блокировку пользователей',
-        privileges:  {
-          moderator: ['Модератор', 'Управляет блокировками пользователей и следит за пользовательским контентом.']
-        }
-      },
-      content_managers: {
-        name:        'Контент-менеджеры',
-        description: 'Отвечают за наполнение информационных разделов',
-        privileges:  {
-          content_manager: ['Контент-менеджер', 'Редактирует информационные разделы.']
-        }
-      },
-      feedback_managers: {
-        name: 'Менеджеры обратной связи',
-        description: 'Отвечают за обратную связь с пользователями',
-        privileges: {
-          feedback_manager: ['Менеджер обратной связи', 'Обрабатывает обращения через формы обратной связи.']
-        }
-      }
-    }
-
-    groups.each do |slug, data|
-      privilege_group = PrivilegeGroup.create!(
-        slug:        slug,
-        name:        data[:name],
-        description: data[:description],
-        deletable:   false
-      )
-
-      data[:privileges].each do |privilege_slug, privilege_data|
-        privilege = Privilege.create!(
-          slug:        privilege_slug,
-          name:        privilege_data[0],
-          description: privilege_data[1],
-          deletable:   false
-        )
-
-        PrivilegeGroupPrivilege.create!(
-          privilege:       privilege,
-          privilege_group: privilege_group,
-          deletable:       false
-        )
-      end
-    end
-  end
 end

data/db/migrate/20190826111111_add_priority_to_biovision_components.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Add priority column for components table
+class AddPriorityToBiovisionComponents < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists? :biovision_components, :priority
+
+    add_column :biovision_components, :priority, :integer, limit: 2, default: 1, null: false
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/base/base_methods.rb

@@ -9,9 +9,10 @@ module Biovision
       included do
         before_action :set_locale
 
+        helper_method :agent, :visitor_slug
+        helper_method :component_handler
         helper_method :current_page, :param_from_request
         helper_method :current_user, :current_language
-        helper_method :agent, :visitor_slug
       end
 
       # Get current page number from request
@@ -161,14 +162,22 @@ module Biovision
       end
 
       # @param [Class] klass
-      # @param [Hash] options
-      def component_restriction(klass, options = {})
-        return if klass.allow?(current_user, options)
+      # @param [String] privilege_name
+      def component_restriction(klass, privilege_name)
+        return if klass.allow?(current_user, privilege_name)
 
         error = "User #{current_user&.id} has no privileges in #{klass}"
 
         handle_http_401(error)
       end
+
+      def component_slug
+        nil
+      end
+
+      def component_handler
+        @component_handler ||= Biovision::Components::BaseComponent.handler(component_slug, current_user)
+      end
     end
   end
 end

data/lib/biovision/base/version.rb

@@ -2,6 +2,6 @@
 
 module Biovision
   module Base
-    VERSION = '0.39.190804.1'
+    VERSION = '0.41.190905.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.39.190804.1
+  version: 0.41.190905.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,6 +197,7 @@ files:
 - app/assets/images/biovision/base/icons/exit.svg
 - app/assets/images/biovision/base/icons/foreign/facebook.svg
 - app/assets/images/biovision/base/icons/gear.svg
+- app/assets/images/biovision/base/icons/key.svg
 - app/assets/images/biovision/base/icons/lock-closed.svg
 - app/assets/images/biovision/base/icons/lock-open.svg
 - app/assets/images/biovision/base/icons/notice.svg
@@ -395,12 +396,17 @@ files:
 - app/views/admin/components/links/_contact.html.erb
 - app/views/admin/components/links/_content.html.erb
 - app/views/admin/components/links/_users.html.erb
+- app/views/admin/components/privileges.html.erb
+- app/views/admin/components/privileges/_component_user.html.erb
+- app/views/admin/components/privileges/_new_user.html.erb
+- app/views/admin/components/privileges/_users.html.erb
 - app/views/admin/components/settings.html.erb
 - app/views/admin/components/settings/_new_parameter.html.erb
 - app/views/admin/components/settings/_parameters.html.erb
 - app/views/admin/components/settings/_setting.html.erb
 - app/views/admin/components/settings/_settings.html.erb
 - app/views/admin/components/show.html.erb
+- app/views/admin/components/update_privileges.jbuilder
 - app/views/admin/editable_blocks/_nav_item.html.erb
 - app/views/admin/editable_blocks/entity/_in_list.html.erb
 - app/views/admin/editable_blocks/index.html.erb
@@ -626,6 +632,7 @@ files:
 - app/views/shared/admin/_list_with_priority.html.erb
 - app/views/shared/admin/_toggleable.html.erb
 - app/views/shared/editable_pages/_body.html.erb
+- app/views/shared/entity/_attributes.html.erb
 - app/views/shared/entity/_meta_texts.html.erb
 - app/views/shared/entity/_metadata.html.erb
 - app/views/shared/entity/_timestamps.html.erb
@@ -701,7 +708,8 @@ files:
 - db/migrate/20190610141414_add_user_to_feedback_requests.rb
 - db/migrate/20190730000000_create_biovision_component_users.rb
 - db/migrate/20190731222222_add_biovision_component_to_metrics.rb
-- db/migrate/20190801111111_add_components.rb
+- db/migrate/20190826111111_add_priority_to_biovision_components.rb
+- db/migrate/20190826121212_add_components.rb
 - db/obsolete_migrations/20171223333333_amend_foreign_keys.rb
 - db/obsolete_migrations/20180117151515_add_language_to_models.rb
 - db/obsolete_migrations/20180321000000_add_profile_data_to_users.rb