biovision-base 0.9.171227 → 0.11.180127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bb51fe50abffa84bf05497d98302f8024cb97c8174dd1107c209405cdb36bd8
-  data.tar.gz: 18998efeae8acc7888f2a4942117a233c346e66d3591f845938976ee94f3231e
+  metadata.gz: 8f9fa1898ab0825170025cc1c9d2c4409672fae0124dfd8eb292fa20b5d5efb0
+  data.tar.gz: f9e2d769bd9ed60b43021af0c8f315a21ec381b2e258e650a26b638367a61005
 SHA512:
-  metadata.gz: 14e334effd38045f5a5b0f69f08587d8910ad9b5d64a409b802005ebcaa814e98b35153ce36e74c289463d5f6e4bd383d525063ec6e87cc0dd0c3aafcf71c939
-  data.tar.gz: a00cbf51d51d0fbb5dc51028daab2909bc93ce74ec2a57ca6b633d7ef336b2d7a518b8afadfdfd5e09a3126f2d95e90e5502e7717e76498befafad15074ee393
+  metadata.gz: 193adfd352a265199c0d5376068279a47640b8bc5c1e43f197b251e6bea7c7d3a809a0003946d2a9b693c6c37efb13c26f558e9aa094aabebb14b84ff1021f80
+  data.tar.gz: 0c97feb7d31796b88bb95c92ac634adf37d9ac57e3aecd76797bcbb685f58fdfce60126dd4c0e489752147c38bfa142b1456ba7e1fc11bec32f0aadc61e58790

data/app/assets/javascripts/biovision/base/biovision-sliders.js

@@ -1,10 +1,9 @@
 'use strict';
 
 document.addEventListener('DOMContentLoaded', function () {
-    const sliders = document.querySelectorAll('.biovision-slider');
     const sliding = {
         opacity: {
-            left: function(list, delay) {
+            left: function (list, delay) {
                 const li = list.querySelector('li:last-of-type');
                 const restore_opacity = function () {
                     li.style.opacity = '';
@@ -14,7 +13,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 list.prepend(li);
                 setTimeout(restore_opacity, delay);
             },
-            right: function(list, delay) {
+            right: function (list, delay) {
                 const li = list.querySelector('li:first-of-type');
                 const move = function () {
                     list.append(li);
@@ -27,7 +26,7 @@ document.addEventListener('DOMContentLoaded', function () {
         }
     };
 
-    Array.prototype.slice.call(sliders).forEach(function(slider) {
+    document.querySelectorAll('.biovision-slider').forEach(function (slider) {
         const delay = slider.getAttribute('data-delay') || 125;
         const list = slider.querySelector('ul');
         let type = slider.getAttribute('data-type') || 'opacity';
@@ -49,16 +48,3 @@ document.addEventListener('DOMContentLoaded', function () {
         slider.querySelector('button.next').addEventListener('click', slide_right);
     });
 });
-
-/*
-
-<script>
-    'use strict';
-
-    document.addEventListener('DOMContentLoaded', function () {
-        const slider = document.getElementById('crew-slider');
-    });
-</script>
-
-
- */

data/app/assets/javascripts/biovision/base/biovision.js

@@ -107,7 +107,7 @@ const Biovision = {
             console.log(response);
         }
     },
-    transliterate: function(input) {
+    transliterate: function (input) {
         const char_map = {
             'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd',
             'е': 'e', 'ё': 'yo', 'ж': 'zh', 'з': 'z', 'и': 'i',
@@ -205,7 +205,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 const url = element.parentNode.getAttribute('data-url');
                 const parameter = element.getAttribute('data-flag');
 
-                const on_success = function() {
+                const on_success = function () {
                     const response = JSON.parse(this.responseText);
 
                     if (response.hasOwnProperty('data')) {
@@ -224,7 +224,7 @@ document.addEventListener('DOMContentLoaded', function () {
                     }
                 };
 
-                const on_failure = function() {
+                const on_failure = function () {
                     element.className = 'unknown';
                     Biovision.handle_ajax_failure.call(this);
                 };
@@ -246,7 +246,7 @@ document.addEventListener('DOMContentLoaded', function () {
             let item = element.closest('li[data-number]');
 
             if (parseInt(item.getAttribute('data-number')) + delta > 0) {
-                const on_success = function() {
+                const on_success = function () {
                     const response = JSON.parse(this.responseText);
 
                     if (response.hasOwnProperty('data')) {
@@ -276,7 +276,7 @@ document.addEventListener('DOMContentLoaded', function () {
                             } else {
                                 return 0;
                             }
-                        }).forEach(function(item) {
+                        }).forEach(function (item) {
                             container.appendChild(item);
                         });
                     }
@@ -337,6 +337,18 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     });
 
+    document.querySelectorAll('form[data-remote]').forEach(function (form) {
+        const button = form.querySelector('button[type=submit]');
+
+        form.addEventListener('ajax:before', function () {
+            button.disabled = true;
+        });
+
+        form.addEventListener('ajax:complete', function () {
+            button.disabled = false;
+        });
+    });
+
     if (typeof jQuery !== 'undefined') {
         jQuery.ajaxSetup({
             headers: {

data/app/assets/stylesheets/biovision/base/admin.scss

@@ -204,18 +204,6 @@ nav.admin-breadcrumbs {
   ul {
     border-left: $border-primary;
     margin: .8rem 0 0 2.4rem;
-
-    &.regions {
-      margin: 0 0 0 1.2rem;
-      padding: 0;
-      border: none;
-
-      > li {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-      }
-    }
   }
 }
 

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -8,183 +8,6 @@ textarea {
   font-size: $font-size-normal;
 }
 
-article.entity-page {
-  position: relative;
-
-  > nav {
-    ul {
-      margin: 1.6rem 0;
-      padding: 0;
-
-      li {
-        list-style: none;
-        display: inline-block;
-        margin: 0 1.6rem;
-
-        a {
-          @include button-nav;
-        }
-      }
-    }
-  }
-
-  table {
-    border-spacing: 0;
-    margin: 1.6rem;
-
-    figure {
-      margin: 0;
-      padding: 0;
-      text-align: center;
-
-      img {
-        max-height: 32rem;
-        max-width: 32rem;
-      }
-    }
-
-    tbody {
-      tr:nth-of-type(even) {
-        background: $row-background-even;
-      }
-
-      tr:nth-of-type(odd) {
-        background: $row-background-odd;
-      }
-
-      th {
-        padding: .4rem .8rem;
-        text-align: right;
-      }
-
-      td {
-        padding: .4rem .8rem;
-
-        &[colspan]:first-letter {
-          text-transform: capitalize;
-        }
-
-        figure {
-          text-align: center;
-        }
-      }
-    }
-  }
-
-  form {
-    table {
-      th {
-        font-weight: normal;
-        line-height: 2.8rem;
-        text-align: right;
-        vertical-align: top;
-
-        &[colspan] {
-          border-top: .1rem solid $text-color-secondary;
-          font-weight: bold;
-          padding-top: 1.6rem;
-          text-align: center;
-        }
-      }
-
-      input[type=text]:not([size]), input[type=url], textarea {
-        width: calc(100% - 1rem);
-      }
-
-      tfoot {
-        td {
-          padding: .8rem 0;
-          text-align: center;
-        }
-      }
-
-      .flags {
-        text-align: left;
-
-        ul {
-          margin: 0;
-          padding: 0;
-
-          > li {
-            list-style: none;
-            margin: 0;
-            padding: 0;
-          }
-        }
-
-        label {
-          font-weight: normal;
-        }
-      }
-
-      .tree {
-        text-align: left;
-
-        > ul {
-          margin: 0;
-          padding: 0;
-
-          li {
-            list-style: none;
-            margin: 0;
-            padding: 0;
-
-            label {
-              font-weight: normal;
-            }
-
-            ul {
-              margin: 0 0 0 2rem;
-              padding: 0;
-            }
-          }
-        }
-      }
-    }
-
-    .fields {
-      figure {
-        margin: 0 auto;
-        padding: 0;
-        max-width: 32rem;
-        text-align: center;
-
-        img {
-          max-width: 100%;
-        }
-      }
-
-      > div {
-        background: $row_background_odd;
-        padding: .4rem 0;
-
-        &:nth-of-type(even) {
-          background: $row_background_even;
-        }
-
-        > div {
-          padding: 0 .4rem;
-        }
-      }
-
-      ul.flags {
-        margin: 0;
-        padding: 0;
-
-        li {
-          list-style: none;
-          margin: 0;
-          padding: .4rem;
-        }
-      }
-
-      input:not([type=checkbox]):not([size]), textarea {
-        width: calc(100% - 1rem);
-      }
-    }
-  }
-}
-
 ul.actions {
   align-items: center;
   background: #fff;
@@ -268,9 +91,10 @@ ul.actions {
     }
 
     .image {
-      flex-basis: 8rem;
+      flex: none;
       margin: 0 .8rem 0 0;
       text-align: center;
+      width: 8rem;
 
       img {
         max-height: 8rem;
@@ -284,7 +108,6 @@ ul.actions {
 
     .data {
       flex: 1;
-      max-width: 100%;
       position: relative;
 
       .info {

data/app/assets/stylesheets/biovision/base/default_admin.scss

@@ -32,7 +32,6 @@ $link-color-hover: rgb(255, 77, 20) !default;
 @import "biovision/base/buttons";
 @import "biovision/base/biovision";
 @import "biovision/base/admin";
-@import "biovision/base/regions";
 @import "biovision/base/tootik";
 @import "biovision/base/message-box";
 @import "biovision/base/pagination";

data/app/controllers/admin/privileges_controller.rb

@@ -20,12 +20,6 @@ class Admin::PrivilegesController < AdminController
     @collection = @entity.users.page_for_administration(current_page)
   end
 
-  # get /admin/privileges/:id/regions
-  def regions
-    @user       = User.find_by(id: params[:user_id])
-    @collection = Region.visible.for_tree(params[:parent_id]).reject { |r| @entity.has_user?(@user, r) }
-  end
-
   protected
 
   def restrict_access

data/app/controllers/admin/users_controller.rb

@@ -31,14 +31,14 @@ class Admin::UsersController < AdminController
 
   # put /admin/users/:id/privileges/:privilege_id
   def grant_privilege
-    @privilege.grant(@entity, Region.find_by(id: params[:region_id]))
+    @privilege.grant(@entity, params[:region_id])
 
     render json: { data: { user_privilege_ids: @entity.user_privilege_ids } }
   end
 
   # delete /admin/users/:id/privileges/:privilege_id
   def revoke_privilege
-    @privilege.revoke(@entity, Region.find_by(id: params[:region_id]))
+    @privilege.revoke(@entity, params[:region_id])
 
     render json: { data: { user_privilege_ids: @entity.user_privilege_ids } }
   end

data/app/models/editable_page.rb

@@ -1,23 +1,36 @@
 class EditablePage < ApplicationRecord
   include RequiredUniqueName
-  include RequiredUniqueSlug
 
   NAME_LIMIT = 100
   SLUG_LIMIT = 100
   META_LIMIT = 250
   BODY_LIMIT = 65535
 
+  PRIORITY_RANGE = (1..999)
+
   mount_uploader :image, EditablePageImageUploader
 
+  belongs_to :language, optional: true
+
+  before_validation { self.slug = slug.strip unless slug.nil? }
+  before_validation :normalize_priority
+
+  validates_presence_of :slug
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :slug, maximum: SLUG_LIMIT
   validates_length_of :title, maximum: META_LIMIT
   validates_length_of :keywords, maximum: META_LIMIT
   validates_length_of :description, maximum: META_LIMIT
-  # validates_length_of :body, maximum: BODY_LIMIT
+  validates_length_of :body, maximum: BODY_LIMIT
+  validates_uniqueness_of :slug, scope: [:language_id]
+
+  scope :ordered_by_slug, -> { order('slug asc') }
+  scope :with_slug_like, ->(slug) { where('slug ilike ?', "%#{slug}%") unless slug.blank? }
+  scope :with_slug, ->(slug) { where('lower(slug) = lower(?)', slug) unless slug.blank? }
+  scope :siblings, ->(s) { where(language: s.language, nav_group: s.nav_group) }
 
   def self.page_for_administration
-    ordered_by_name
+    ordered_by_slug
   end
 
   def self.entity_parameters
@@ -27,4 +40,29 @@ class EditablePage < ApplicationRecord
   def self.creation_parameters
     entity_parameters + %i(slug)
   end
+
+  # @param [Integer] delta
+  def change_priority(delta)
+    new_priority = priority + delta
+    adjacent     = self.class.siblings(self).find_by(priority: new_priority)
+    if adjacent.is_a?(self.class) && (adjacent.id != id)
+      adjacent.update!(priority: priority)
+    end
+    update(priority: new_priority)
+
+    self.class.siblings(self).map { |e| [e.id, e.priority] }.to_h
+  end
+
+  private
+
+  def set_next_priority
+    if id.nil? && priority == 1
+      self.priority = self.class.siblings(self).maximum(:priority).to_i + 1
+    end
+  end
+
+  def normalize_priority
+    self.priority = PRIORITY_RANGE.first if priority < PRIORITY_RANGE.first
+    self.priority = PRIORITY_RANGE.last if priority > PRIORITY_RANGE.last
+  end
 end