biovision-base 0.9.171227 → 0.11.180127

data/app/models/feedback_request.rb

@@ -9,6 +9,7 @@ class FeedbackRequest < ApplicationRecord
 
   toggleable :processed
 
+  belongs_to :language, optional: true
   belongs_to :agent, optional: true
 
   validates_length_of :name, maximum: NAME_LIMIT

data/app/models/language.rb

@@ -0,0 +1,49 @@
+class Language < ApplicationRecord
+  SLUG_LIMIT     = 20
+  CODE_LIMIT     = 8
+  PRIORITY_RANGE = (1..999)
+
+  has_many :users, dependent: :nullify
+  has_many :user_languages, dependent: :delete_all
+  has_many :editable_pages, dependent: :nullify
+  has_many :feedback_requests, dependent: :nullify
+
+  after_initialize :set_next_priority
+
+  before_validation :normalize_priority
+
+  validates_presence_of :code, :slug
+  validates_format_of :code, with: /\A[a-z][a-z_]*[a-z]\z/i
+  validates_format_of :slug, with: /\A[a-z][a-z_]+[a-z]\z/
+  validates_length_of :code, maximum: CODE_LIMIT
+  validates_length_of :slug, maximum: SLUG_LIMIT
+  validates_uniqueness_of :code
+  validates_uniqueness_of :slug
+
+  scope :ordered_by_priority, -> { order('priority asc') }
+
+  # @param [Integer] delta
+  def change_priority(delta)
+    new_priority = priority + delta
+    adjacent     = self.class.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.ordered_by_priority.map { |e| [e.id, e.priority] }.to_h
+  end
+
+  private
+
+  def set_next_priority
+    if id.nil? && priority == 1
+      self.priority = self.class.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

data/app/models/privilege.rb

@@ -91,33 +91,33 @@ class Privilege < ApplicationRecord
   end
 
   # @param [User] user
-  # @param [Region] region
-  def has_user?(user, region = nil)
+  # @param [Array] region_ids
+  def has_user?(user, region_ids = [])
     return false if user.nil?
     return true if user.super_user?
     result = user_in_non_regional_branch?(user)
 
-    if regional? && !region.nil? && !result
-      result = user_in_regional_branch?(user, region)
+    if regional? && region_ids.any? && !result
+      result = user_in_regional_branch?(user, region_ids)
     end
     result
   end
 
   # @param [User] user
-  # @param [Region] region
-  def grant(user, region = nil)
+  # @param [Integer] region_id
+  def grant(user, region_id = nil)
     return if user.nil?
-    criteria          = { privilege: self, user: user }
-    criteria[:region] = region if regional?
+    criteria             = { privilege: self, user: user }
+    criteria[:region_id] = region_id if regional?
     UserPrivilege.create(criteria) unless UserPrivilege.exists?(criteria)
   end
 
   # @param [User] user
-  # @param [Region] region
-  def revoke(user, region = nil)
+  # @param [Integer] region_id
+  def revoke(user, region_id = nil)
     return if user.nil?
-    criteria          = { privilege: self, user: user }
-    criteria[:region] = region if regional?
+    criteria             = { privilege: self, user: user }
+    criteria[:region_id] = region_id if regional?
     UserPrivilege.where(criteria).delete_all
   end
 
@@ -161,14 +161,14 @@ class Privilege < ApplicationRecord
   end
 
   # @param [User] user
-  # @param [Region] region
-  def user_in_regional_branch?(user, region)
+  # @param [Array] region_ids
+  def user_in_regional_branch?(user, region_ids)
     selected_ids = Privilege.where(regional: true, id: branch_ids).pluck(:id)
     if selected_ids.any?
       criteria = {
         privilege_id: selected_ids,
-        region_id: region.branch_ids,
-        user: user
+        region_id:    region_ids,
+        user:         user
       }
       UserPrivilege.exists?(criteria)
     else

data/app/models/user.rb

@@ -19,9 +19,9 @@ class User < ApplicationRecord
 
   mount_uploader :image, AvatarUploader
 
+  belongs_to :language, optional: true, counter_cache: true
   belongs_to :agent, optional: true
   belongs_to :inviter, class_name: User.to_s, optional: true
-  belongs_to :region, optional: true, counter_cache: true
   has_one :user_profile, dependent: :destroy
   has_many :invitees, class_name: User.to_s, foreign_key: :inviter_id, dependent: :nullify
   has_many :tokens, dependent: :delete_all
@@ -30,6 +30,7 @@ class User < ApplicationRecord
   has_many :privileges, through: :user_privileges
   has_many :foreign_users, dependent: :delete_all
   has_many :login_attempts, dependent: :delete_all
+  has_many :user_languages, dependent: :delete_all
 
   before_save :normalize_slug
   before_save :prepare_search_string
@@ -56,7 +57,7 @@ class User < ApplicationRecord
 
   # @param [Integer] page
   # @param [String] search_query
-  def self.page_for_administration(page, search_query)
+  def self.page_for_administration(page, search_query = '')
     search(search_query).order('id desc').page(page).per(PER_PAGE)
   end
 

data/app/models/user_language.rb

@@ -0,0 +1,6 @@
+class UserLanguage < ApplicationRecord
+  belongs_to :user
+  belongs_to :language
+
+  validates_uniqueness_of :language_id, scope: [:user_id]
+end

data/app/models/user_privilege.rb

@@ -3,7 +3,6 @@ class UserPrivilege < ApplicationRecord
 
   belongs_to :user
   belongs_to :privilege, counter_cache: :users_count
-  belongs_to :region, optional: true
 
   validates_uniqueness_of :privilege_id, scope: [:user_id, :region_id]
 
@@ -17,12 +16,12 @@ class UserPrivilege < ApplicationRecord
 
   # @param [User] user
   # @param [String|Symbol] privilege_name
-  # @param [Region] region
-  def self.user_has_privilege?(user, privilege_name, region = nil)
+  # @param [Array] region_ids
+  def self.user_has_privilege?(user, privilege_name, region_ids = [])
     return false if user.nil?
     return true if user.super_user?
     privilege = Privilege.find_by(slug: privilege_name)
-    privilege&.has_user?(user, region)
+    privilege&.has_user?(user, region_ids)
   end
 
   # @param [User] user
@@ -41,14 +40,4 @@ class UserPrivilege < ApplicationRecord
     return false if privilege_ids.blank?
     exists?(user: user, privilege_id: privilege_ids)
   end
-
-  private
-
-  def regional_ids(region)
-
-  end
-
-  def simple_ids
-
-  end
 end

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

@@ -3,7 +3,7 @@
   <% unless entity.browser.nil? %>
       <div class="info"><%= admin_browser_link(entity.browser) %></div>
   <% end %>
-  <%= render partial: 'admin/agents/toggleable', locals: { entity: entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_agent_path(entity.id) } %>
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
       <%= edit_icon edit_agent_path(entity) %>

data/app/views/admin/agents/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.agents.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>

data/app/views/admin/agents/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">
@@ -24,5 +24,5 @@
       </dl>
   <% end %>
 
-  <%= render partial: 'admin/agents/toggleable', locals: { entity: @entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_agent_path(@entity.id) } %>
 </article>

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

@@ -3,7 +3,8 @@
   <div class="info">
     <%= t(:agent_count, count: entity.agents_count) %>
   </div>
-  <%= render partial: 'admin/browsers/toggleable', locals: { entity: entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_browser_path(entity.id) } %>
+
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
       <%= edit_icon edit_browser_path(entity.id) %>

data/app/views/admin/browsers/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.browsers.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/browsers/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
   <ul class="actions">
     <li><%= create_icon new_browser_path %></li>
@@ -15,7 +15,7 @@
     <% end %>
   </ul>
 
-  <%= render partial: 'admin/browsers/toggleable', locals: { entity: @entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_browser_path(@entity.id) } %>
 
   <section id="browser-agents">
     <h2><%= t('admin.agents.index.heading') %></h2>

data/app/views/admin/codes/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.codes.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/codes/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.body %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.body %></h1>
 
   <ul class="actions">

data/app/views/admin/editable_pages/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.editable_pages.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>

data/app/views/admin/editable_pages/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">

data/app/views/admin/index/_biovision_base.html.erb

@@ -1,6 +1,7 @@
 <%= render 'admin/index/dashboard/settings' %>
 <%= render 'admin/index/dashboard/biovision_track' %>
-<%= render 'admin/index/dashboard/biovision_region' %>
+<%= render 'admin/index/dashboard/biovision_regions' if Gem.loaded_specs.key?('biovision-regions') %>
 <%= render 'admin/index/dashboard/biovision_user' %>
 <%= render 'admin/index/dashboard/editorial' %>
+<%= render 'admin/index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
 <%= render 'admin/index/dashboard/biovision_feedback' %>

data/app/views/admin/media_files/show.html.erb

@@ -18,7 +18,6 @@
     <li><%= edit_icon(edit_media_file_path(@entity.id)) %></li>
   </ul>
 
-
   <dl>
     <dt><%= t('activerecord.attributes.media_file.file') %></dt>
     <dd>

data/app/views/admin/metrics/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.metrics.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/metrics/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">

data/app/views/admin/privilege_groups/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.privilege_groups.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>

data/app/views/admin/privilege_groups/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">

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

@@ -8,7 +8,7 @@
     <div><%= entity.privilege_groups.map(&:name).join(', ') %></div>
     <div><%= link_to t(:user_count, count: entity.users_count), users_admin_privilege_path(entity.id) %></div>
   </div>
-  <%= render partial: 'admin/privileges/toggleable', locals: { entity: entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_privilege_path(entity.id) } %>
 
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">

data/app/views/admin/privileges/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.privileges.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/privileges/show.html.erb

@@ -7,7 +7,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">
@@ -44,7 +44,7 @@
     <% end %>
   </dl>
 
-  <%= render partial: 'admin/privileges/toggleable', locals: { entity: @entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_privilege_path(@entity.id) } %>
 
   <nav>
     <ul>

data/app/views/admin/privileges/users.html.erb

@@ -8,7 +8,7 @@
     <span><%= t('.heading') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.full_title %></h1>
   <ul class="actions">
     <li><%= return_icon(admin_privilege_path(@entity)) %></li>

data/app/views/admin/stored_values/index.html.erb

@@ -3,7 +3,7 @@
     <span><%= t('admin.stored_values.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>

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

@@ -17,7 +17,7 @@
         <div class="truncate"><%= entity.agent.name %></div>
     <% end %>
   </div>
-  <%= render partial: 'admin/tokens/toggleable', locals: { entity: entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_token_path(entity.id) } %>
 
   <ul class="actions">
     <li><%= edit_icon edit_token_path(entity) %></li>