biovision-post 0.1.171229 → 0.1.180127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be80d9c2f7d4d049810beb5d10445ad941141a6984fedefc72afc66f5d8aa26c
-  data.tar.gz: 18afaf4b8bd45ccce8ed430f44ebb2ba29782b81ea0ed835fb7a1f77ae1e83a7
+  metadata.gz: b889ba7a155e2072f97474ffa415f86b0aaeb387d5266de6f08715ca090dc016
+  data.tar.gz: b20b223bca477ff0f077720a6102a69dbdd72e68e8b6bbeabb821d632c5296c8
 SHA512:
-  metadata.gz: b7e5489d2ca7af603433b61f51fa4b9c15871b4e0c146eb2fd19840bc52e73788f894386859b85700fd7fc5c09e0f60634bc9bda5e9e6ef942a6c90817ba1c01
-  data.tar.gz: 1b5a1c2fad734dea9eb2c582a4f95fbc3bdb5eab16e2f5458fe42d9709ad8506e1708685b3e54d68be2850199d77771730f11bb0616c0a94fb5dacc87f6b80e4
+  metadata.gz: 9c4e4732cd224dfb38af8e72f881d306bed081a5382fcee710e493b685a87a7c7ba1b8b276660dde410adbfe6529b14a7ac1f2722d91f20e6fb0e52a9b792f81
+  data.tar.gz: e5f81682ceb25780a39098d3197fe1120b5e70051de31ebffa7b89baba832b771833b4120e127b6d4d117cdc31b8d0ee21ee5d6664b85b2e06bef2e7f95b975d

data/app/models/post.rb

@@ -1,7 +1,7 @@
 class Post < ApplicationRecord
   include HasOwner
-  include CommentableItem if 'CommentableItem'.safe_constantize
-  include VotableItem if 'VotableItem'.safe_constantize
+  include CommentableItem if Gem.loaded_specs.key?('biovision-comment')
+  include VotableItem if Gem.loaded_specs.key?('biovision-vote')
   include Toggleable
 
   TITLE_LIMIT  = 140
@@ -11,16 +11,17 @@ class Post < ApplicationRecord
   BODY_LIMIT   = 50000
   META_LIMIT   = 250
   ALT_LIMIT    = 200
-  PER_PAGE     = 10
+  PER_PAGE     = 12
 
   toggleable :visible, :show_owner, :allow_comments
 
   mount_uploader :image, PostImageUploader
 
   belongs_to :user
-  belongs_to :region, optional: true
+  belongs_to :region, optional: true if Gem.loaded_specs.key?('biovision-regions')
   belongs_to :post_type, counter_cache: true
   belongs_to :post_category, counter_cache: true, optional: true
+  belongs_to :language, optional: true
   belongs_to :agent, optional: true
 
   after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }

data/app/views/admin/index/{_biovision_post.html.erb → dashboard/_biovision_post.html.erb}

@@ -23,7 +23,7 @@
           </ul>
         </li>
         <li><%= render 'admin/posts/nav_item' %></li>
-        <%= render 'admin/index/biovision_post/additional_items' %>
+        <%= render 'admin/index/dashboard/biovision_post/additional_items' %>
       </ul>
     </nav>
 <% end %>

data/app/views/admin/posts/entity/_in_list.html.erb

@@ -27,7 +27,15 @@
   <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_post_path(entity) } %>
 
   <ul class="actions">
-    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: (current_user_has_privilege?(:chief_editor, current_region) ? lock_admin_post_path(entity.id) : '') } %>
+    <%=
+      render(
+          partial: 'shared/actions/locks',
+          locals: {
+              entity: entity,
+              path: (current_user_has_privilege?(:chief_editor) ? lock_admin_post_path(entity.id) : '')
+          }
+      )
+    %>
     <li class="lockable <%= entity.editable_by?(current_user) ? '' : 'hidden' %>">
       <%= edit_icon(edit_post_path(entity.id)) %>
     </li>

data/app/views/post_categories/_form.html.erb

@@ -1,4 +1,3 @@
-
 <%= form_with model: entity, html: { id: 'post-category-form' } do |f| %>
     <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
@@ -50,20 +49,3 @@
       <%= f.button t(:save), type: :submit %>
     </div>
 <% end %>
-
-<script>
-    'use strict';
-
-    document.addEventListener('DOMContentLoaded', function () {
-        const form = document.getElementById('post-category-form');
-        const button = form.querySelector('button[type=submit]');
-
-        form.addEventListener('ajax:before', function() {
-            button.disabled = true;
-        });
-
-        form.addEventListener('ajax:complete', function(request, status) {
-            button.disabled = false;
-        });
-    });
-</script>

data/app/views/posts/_form.html.erb

@@ -21,7 +21,7 @@
       </dd>
     <% end %>
 
-    <% if Region.any? %>
+    <% if Gem.loaded_specs.key?('biovision-regions') && Region.any? %>
       <dt><%= f.label :region_id %></dt>
       <dd>
         <%# radio_button_tag 'post[region_id]', '', entity.region.nil?, id: 'post_region_0' %>
@@ -144,7 +144,7 @@
           <%= f.check_box :show_owner, id: :post_show_owner %>
           <%= f.label :show_owner %>
         </li>
-        <% if 'CommentableItem'.safe_constantize %>
+        <% if Gem.loaded_specs.key?('biovision-comment') %>
           <li>
             <%= f.check_box :allow_comments, id: :post_allow_comments %>
             <%= f.label :allow_comments %>
@@ -161,5 +161,3 @@
 <% end %>
 
 <%= render 'posts/form/wysiwyg' %>
-
-<%= render partial: 'shared/forms/default_ajax_handler', locals: { form_id: 'post-form' } %>

data/config/locales/posts-en.yml

@@ -32,6 +32,7 @@ en:
         image_author_link: "Image author link"
         image_author_name: "Image author name"
         image_name: "Image name"
+        language_id: "Language"
         lead: "Lead"
         meta_description: "Description for meta tag"
         meta_keywords: "Keywords for meta tag"
@@ -101,8 +102,9 @@ en:
       show:
         title: "Post \"%{name}\""
     index:
-      biovision_post:
-        heading: "Posts module"
+      dashboard:
+        biovision_post:
+          heading: "Posts module"
   post_categories:
     new:
       title: "New post category"

data/config/locales/posts-ru.yml

@@ -32,6 +32,7 @@ ru:
         image_author_link: "Ссылка на автора изображения"
         image_author_name: "Автор изображения"
         image_name: "Название изображения"
+        language_id: "Язык"
         lead: "Аннотация"
         meta_description: "Описание для метатэга"
         meta_keywords: "Ключевые слова для метатэга"
@@ -101,8 +102,9 @@ ru:
       show:
         title: "Публикация «%{name}»"
     index:
-      biovision_post:
-        heading: "Модуль публикаций"
+      dashboard:
+        biovision_post:
+          heading: "Модуль публикаций"
   post_categories:
     new:
       title: "Новая категория публикаций"

data/db/migrate/20170930000003_create_posts.rb

@@ -6,7 +6,8 @@ class CreatePosts < ActiveRecord::Migration[5.1]
         t.references :user, foreign_key: { on_update: :cascade, on_delete: :cascade }
         t.references :post_type, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
         t.references :post_category, foreign_key: { on_update: :cascade, on_delete: :cascade }
-        t.references :region, foreign_key: { on_update: :cascade, on_delete: :nullify }
+        t.references :language, foreign_key: { on_update: :cascade, on_delete: :nullify }
+        t.integer :region_id
         t.integer :original_post_id
         t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
         t.inet :ip

data/db/migrate/20180124111113_add_language_to_posts.rb

@@ -0,0 +1,11 @@
+class AddLanguageToPosts < ActiveRecord::Migration[5.1]
+  def up
+    unless column_exists?(:posts, :language_id)
+      add_reference :posts, :language, foreign_key: { on_update: :cascade, on_delete: :nullify }
+    end
+  end
+
+  def down
+  #   no rollback
+  end
+end

data/lib/biovision/post/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Post
-    VERSION = '0.1.171229'
+    VERSION = '0.1.180127'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-post
 version: !ruby/object:Gem::Version
-  version: 0.1.171229
+  version: 0.1.180127
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,8 +146,8 @@ files:
 - app/services/post_manager/blog_post_handler.rb
 - app/services/post_manager/news_handler.rb
 - app/uploaders/post_image_uploader.rb
-- app/views/admin/index/_biovision_post.html.erb
-- app/views/admin/index/biovision_post/_additional_items.html.erb
+- app/views/admin/index/dashboard/_biovision_post.html.erb
+- app/views/admin/index/dashboard/biovision_post/_additional_items.html.erb
 - app/views/admin/post_categories/entity/_in_list.html.erb
 - app/views/admin/post_categories/show.html.erb
 - app/views/admin/post_types/_nav_item.html.erb
@@ -201,6 +201,7 @@ files:
 - db/migrate/20170930000003_create_posts.rb
 - db/migrate/20171218111111_add_meta_fields_to_posts.rb
 - db/migrate/20171219111112_add_author_fields_to_posts.rb
+- db/migrate/20180124111113_add_language_to_posts.rb
 - lib/biovision/post.rb
 - lib/biovision/post/engine.rb
 - lib/biovision/post/version.rb