biovision-base 0.20.180731.0 → 0.21.180812.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 878d3c84e3d6e08ba4fa008b488ed44edd05a0da401a1845782c7f31a3fab464
-  data.tar.gz: f4e73e086c4fe87bf11f2c68e7ceb26daaeb0507e0699990cb0729a38758338a
+  metadata.gz: fe07ebb0c3da033a5ad0e0b65729448ad05c47511deb17da001ef960a5e95cc1
+  data.tar.gz: d0b3269f72e6a6f64dc1f1f5e4aeebac1f26bc040b58754af01c5a5898448434
 SHA512:
-  metadata.gz: 2a1c30cb8db14f7831172840f86d9a05a4352e7d833e0c2b1e9e5d7c68515afe90aa499f9a9675478a46e572261a01e76f19ff4f9da6cf023d7155135f458781
-  data.tar.gz: 71512a52954db3ceb82eaa5fc64fa9b773b2388c8117940194e972106c973b67b9a2fb59714c1e5ff20eb6bf8da3df38255af27b5b1d7f64b8415eea08003d7a
+  metadata.gz: 1f3b099642e625e586cb11741a35d9eec303aa655e71713a46efc9c0e8b354fd03f9a1ebdfa93819fa5c14512386930de33f0f680a0269da6804c7eb021ee28d
+  data.tar.gz: 58ee25c71e41d9ea86fe6a899cbb6b4bdc212f44e6ce217288ed87b8aff3d07b414a86474c1dfca6fdc49c35a775de53c1de1c95926de326f3c3283184e50414

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

@@ -220,7 +220,7 @@ const Biovision = {
                             const container = form.querySelector('[data-field="' + key + '"]');
 
                             if (container) {
-                                const errors = response.meta.errors;
+                                const errors = response.meta['errors'];
 
                                 if (errors.hasOwnProperty(key)) {
                                     container.innerHTML = errors[key].join('; ');
@@ -234,7 +234,7 @@ const Biovision = {
                 }
             });
 
-            const data = new window.FormData();
+            const data = new FormData();
             Array.from((new FormData(form)).entries()).forEach(function (entry) {
                 const value = entry[1];
 
@@ -330,6 +330,49 @@ const Biovision = {
         if (this.rows > maxRows) {
             this.rows = maxRows;
         }
+    },
+    remoteFormHandler: function (form) {
+        const button = form.querySelector('button[type=submit]');
+        const loadingMessage = form.querySelector('.loading_message');
+        const stateContainer = form.querySelector('.state_container');
+        const progressPercent = form.querySelector('.state_container .percentage');
+        const progressBar = form.querySelector('.state_container progress');
+
+        form.addEventListener('ajax:before', function () {
+            button.disabled = true;
+
+            if (loadingMessage) {
+                loadingMessage.classList.remove('hidden');
+            }
+        });
+
+        form.addEventListener('ajax:complete', function () {
+            button.disabled = false;
+
+            if (loadingMessage) {
+                loadingMessage.classList.add('hidden');
+            }
+            if (progressBar) {
+                progressBar.value = '0';
+            }
+        });
+
+        if (stateContainer) {
+            form.addEventListener('ajax:beforeSend', function (event) {
+                const request = event.detail[0];
+
+                request.upload.addEventListener('progress', function (e) {
+                    const value = e.loaded / e.total;
+
+                    if (progressPercent) {
+                        progressPercent.innerHTML = (value * 100) + '%';
+                    }
+                    if (progressBar) {
+                        progressBar.value = value;
+                    }
+                });
+            });
+        }
     }
 };
 
@@ -373,7 +416,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
             const container = element.closest('li');
             const button = element.closest('a');
-            const lockable = container.parentNode.querySelectorAll('.lockable');
+            const lockable = container.parentElement.querySelectorAll('.lockable');
             const url = container.getAttribute('data-url');
 
             if (url.length > 1) {
@@ -417,7 +460,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 const url = element.parentNode.getAttribute('data-url');
                 const parameter = element.getAttribute('data-flag');
 
-                const on_success = function () {
+                const onSuccess = function () {
                     const response = JSON.parse(this.responseText);
 
                     if (response.hasOwnProperty('data')) {
@@ -436,12 +479,12 @@ document.addEventListener('DOMContentLoaded', function () {
                     }
                 };
 
-                const on_failure = function () {
+                const onFailure = function () {
                     element.className = 'unknown';
                     Biovision.handleAjaxFailure().call(this);
                 };
 
-                const request = Biovision.newAjaxRequest('POST', url, on_success, on_failure);
+                const request = Biovision.newAjaxRequest('POST', url, onSuccess, onFailure);
                 const data = new FormData();
                 data.append('parameter', parameter);
 
@@ -497,7 +540,7 @@ document.addEventListener('DOMContentLoaded', function () {
                 const request = Biovision.newAjaxRequest('POST', url, onSuccess);
 
                 const data = new FormData();
-                data.append('delta', delta);
+                data.append('delta', String(delta));
 
                 request.send(data);
             }
@@ -555,27 +598,7 @@ document.addEventListener('DOMContentLoaded', function () {
         });
     });
 
-    document.querySelectorAll('form[data-remote]').forEach(function (form) {
-        const button = form.querySelector('button[type=submit]');
-        const loading_message = form.querySelector('.loading_message');
-
-        form.addEventListener('ajax:before', function () {
-            button.disabled = true;
-
-            if (loading_message) {
-                loading_message.classList.remove('hidden');
-            }
-        });
-
-        form.addEventListener('ajax:complete', function () {
-            button.disabled = false;
-
-            if (loading_message) {
-                loading_message.classList.add('hidden');
-            }
-        });
-    });
-
+    document.querySelectorAll('form[data-remote]').forEach(Biovision.remoteFormHandler);
     document.querySelectorAll('form[data-check-url]').forEach(Biovision.instant_check);
 
     document.querySelectorAll('.remove-image-button').forEach(function (button) {
@@ -611,11 +634,11 @@ function handle_ajax_failure(response) {
 document.addEventListener('ajax:beforeSend', function (e) {
     const formData = e.detail[1].data;
 
-    if (!(formData instanceof window.FormData) || !formData.keys) {
+    if (!(formData instanceof FormData) || !formData.keys) {
         return;
     }
 
-    const newFormData = new window.FormData();
+    const newFormData = new FormData();
 
     Array.from(formData.entries()).forEach(function (entry) {
         const value = entry[1];

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

@@ -1,3 +1,23 @@
+:root {
+  --font-size-xxxl: #{$font-size-xxxl};
+  --font-size-xxl: #{$font-size-xxl};
+  --font-size-xl: #{$font-size-xl};
+  --font-size-large: #{$font-size-large};
+  --font-size-increased: #{$font-size-increased};
+  --font-size-normal: #{$font-size-normal};
+  --font-size-decreased: #{$font-size-decreased};
+  --font-size-small: #{$font-size-small};
+  --font-size-xs: #{$font-size-xs};
+
+  --spacer-xxs: #{$spacer-xxs};
+  --spacer-xs: #{$spacer-xs};
+  --spacer-s: #{$spacer-s};
+  --spacer-m: #{$spacer-m};
+  --spacer-l: #{$spacer-l};
+  --spacer-xl: #{$spacer-xl};
+  --spacer-xxl: #{$spacer-xxl};
+}
+
 * {
   box-sizing: border-box;
 }
@@ -19,13 +39,12 @@ h4,
 h5,
 h6 {
   font-family: $font-family-heading;
-  //font-weight: 500;
   margin: 0;
 }
 
 h1 {
-  font-size: 3rem;
-  line-height: 4.2rem;
+  font-size: var(--font-size-xl);
+  line-height: 1.25;
 }
 
 a:link {
@@ -130,7 +149,7 @@ ul.actions {
     flex-wrap: wrap;
     list-style: none;
     margin: 0;
-    padding: 0.8rem;
+    padding: .8rem;
 
     &:nth-of-type(even) {
       background: $row-background-even;
@@ -182,7 +201,7 @@ ul.actions {
 
       .children {
         border-left: .1rem dotted;
-        margin-left: 1.6rem;
+        margin-left: var(--spacer-s);
       }
     }
   }
@@ -224,7 +243,7 @@ form {
 
   .guideline {
     color: $text-color-secondary;
-    font-size: $font-size-decreased;
+    font-size: var(--font-size-decreased);
     margin: 0;
 
     &::before {
@@ -248,7 +267,7 @@ form {
   }
 
   dt {
-    font: 500 $font-size-increased $font-family-main;
+    font: 500 var(--font-size-increased) $font-family-main;
 
     &:not(:first-of-type) {
       border-top: $border-secondary;
@@ -274,7 +293,7 @@ form {
   }
 
   input {
-    font-size: $font-size-normal;
+    font-size: inherit;
   }
 
   ul.flags {
@@ -346,7 +365,7 @@ form {
   }
 }
 
-input.control:not(:checked) + div {
+input.control:not(:checked) + * {
   display: none;
 }
 

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

@@ -1,11 +1,15 @@
 $font-family-main: "Roboto", sans-serif !default;
 $font-family-heading: $font-family-main !default;
 
+$font-size-xxxl: 5.6rem !default;
+$font-size-xxl: 4.5rem !default;
+$font-size-xl: 3.2rem !default;
 $font-size-large: 2.4rem !default;
 $font-size-increased: 1.8rem !default;
 $font-size-normal: 1.6rem !default;
 $font-size-decreased: 1.3rem !default;
 $font-size-small: 1.1rem !default;
+$font-size-xs: 1rem !default;
 
 $content-width: 100rem !default;
 $content-width-min: 32rem !default;
@@ -40,19 +44,3 @@ $spacer-m: 3.2rem;
 $spacer-l: 4.8rem;
 $spacer-xl: 6.4rem;
 $spacer-xxl: 9.6rem;
-
-:root {
-  --font-size-large: #{$font-size-large};
-  --font-size-increased: #{$font-size-increased};
-  --font-size-normal: #{$font-size-normal};
-  --font-size-decreased: #{$font-size-decreased};
-  --font-size-small: #{$font-size-small};
-
-  --spacer-xxs: #{$spacer-xxs};
-  --spacer-xs: #{$spacer-xs};
-  --spacer-s: #{$spacer-s};
-  --spacer-m: #{$spacer-m};
-  --spacer-l: #{$spacer-l};
-  --spacer-xl: #{$spacer-xl};
-  --spacer-xxl: #{$spacer-xxl};
-}

data/app/controllers/admin/foreign_users_controller.rb

@@ -0,0 +1,25 @@
+class Admin::ForeignUsersController < AdminController
+  before_action :set_entity, except: :index
+
+  # get /admin/foreign_users
+  def index
+    @collection = ForeignUser.page_for_administration(current_page)
+  end
+
+  # get /admin/foreign_users/:id
+  def show
+  end
+
+  protected
+
+  def restrict_access
+    require_privilege :administrator
+  end
+
+  def set_entity
+    @entity = ForeignUser.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find foreign_user')
+    end
+  end
+end

data/app/controllers/api/embed_controller.rb

@@ -0,0 +1,6 @@
+class Api::EmbedController < ApplicationController
+  # get /api/embed
+  def index
+    head :no_content
+  end
+end

data/app/controllers/authentication_controller.rb

@@ -35,9 +35,7 @@ class AuthenticationController < ApplicationController
   def set_foreign_site
     @foreign_site = ForeignSite.with_slug(params[:provider]).first
     if @foreign_site.nil?
-      metric = Metric::METRIC_HTTP_503
-      status = :service_unavailable
-      handle_http_error('Cannot set foreign site', metric, status, status)
+      handle_http_503('Cannot set foreign site')
     end
   end
 

data/app/controllers/foreign_users_controller.rb

@@ -0,0 +1,24 @@
+class ForeignUsersController < AdminController
+  before_action :set_entity, only: :destroy
+
+  # delete /foreign_users/:id
+  def destroy
+    if @entity.destroy
+      flash[:notice] = t('foreign_users.destroy.success')
+    end
+    redirect_to admin_foreign_users_path
+  end
+
+  private
+
+  def restrict_access
+    require_privilege :administrator
+  end
+
+  def set_entity
+    @entity = ForeignUser.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find foreign_user')
+    end
+  end
+end

data/app/controllers/media_files_controller.rb

@@ -68,11 +68,27 @@ class MediaFilesController < ApplicationController
       render json: {
         uploaded: 1,
         fileName: File.basename(@entity.name),
-        url: @entity.file.medium_2x.url
+        url:      @entity.file.medium_2x.url
       }
     end
   end
 
+  # post /media_files/medium
+  def medium
+    @entity = MediaFile.create!(medium_image_parameters)
+  end
+
+  # post /media_files/medium-jquery
+  def medium_jquery
+    files = []
+    if params.key?(:files)
+      params[:files].each do |file|
+        files << MediaFile.create(name: "image-#{Time.now.strftime('%F-%H-%M-%S')}", file: file)
+      end
+    end
+    render json: { files: files.map { |f| { url: f.file.medium_2x.url } } }
+  end
+
   protected
 
   def restrict_access
@@ -109,4 +125,11 @@ class MediaFilesController < ApplicationController
     end
     parameters.merge(owner_for_entity(true))
   end
+
+  def medium_image_parameters
+    default_name = { name: "image-#{Time.now.strftime('%F-%H-%M-%S')}" }
+    parameters   = params.require(:media_file).permit(:file)
+
+    parameters.merge(default_name).merge(owner_for_entity(true))
+  end
 end

data/app/helpers/biovision_users_helper.rb

@@ -30,6 +30,12 @@ module BiovisionUsersHelper
     link_to(text, admin_user_path(id: entity.id), class: 'profile')
   end
 
+  # @param [ForeignUser] entity
+  # @param [String] long_slug
+  def admin_foreign_user_link(entity, text = entity.long_slug)
+    link_to(text, admin_foreign_user_path(id: entity.id))
+  end
+
   # @param [User] entity
   def editor_user_link(entity)
     return t(:anonymous) if entity.nil?

data/app/models/foreign_user.rb

@@ -1,5 +1,5 @@
 class ForeignUser < ApplicationRecord
-  PER_PAGE = 20
+  include HasOwner
 
   belongs_to :agent, optional: true
   belongs_to :foreign_site, counter_cache: true
@@ -9,10 +9,15 @@ class ForeignUser < ApplicationRecord
   validates_uniqueness_of :slug, scope: [:foreign_site_id]
 
   scope :ordered_by_slug, -> { order('slug asc') }
+  scope :list_for_administration, -> { ordered_by_slug }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    ordered_by_slug.page(page).per(PER_PAGE)
+    list_for_administration.page(page)
+  end
+
+  def long_slug
+    "#{foreign_site.slug}-#{slug}"
   end
 
   private

data/app/views/admin/foreign_users/_nav_item.html.erb

@@ -0,0 +1,6 @@
+<div>
+  <%= link_to t('.text'), admin_foreign_users_path %>
+</div>
+<div class="description">
+  <%= t('.description') %>
+</div>

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

@@ -0,0 +1,13 @@
+<div class="image">
+  <%= user_image_preview(entity.user) %>
+</div>
+<div class="data">
+  <div><%= admin_foreign_user_link(entity) %></div>
+  <div class="info">
+    <%= admin_user_link(entity.user) %>: <%= entity.name %>
+  </div>
+  <div class="secondary info">
+    <div><%= t(:created_at) %>: <%= time_tag entity.created_at %></div>
+    <%= render partial: 'shared/track', locals: { item: entity } %>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<% content_for :meta_title, t('.title', page: current_page) %>
+<% content_for :breadcrumbs do %>
+    <span><%= t('admin.foreign_users.nav_item.text') %></span>
+<% end %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+  
+  <ul class="actions">
+    <li><%= back_icon(admin_path) %></li>
+  </ul>
+
+  <%= paginate @collection %>
+  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%= paginate @collection %>
+</article>

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

@@ -0,0 +1,62 @@
+<% content_for :meta_title, t('.title', slug: @entity.long_slug) %>
+<% content_for :breadcrumbs do %>
+  <%= link_to(t('admin.foreign_users.nav_item.text'), admin_foreign_users_path) %>
+  <span><%= @entity.long_slug %></span>
+<% end %>
+
+<article>
+  <h1><%= @entity.long_slug %></h1>
+
+  <ul class="actions">
+    <li><%= back_icon(admin_foreign_users_path) %></li>
+    <li class="danger"><%= destroy_icon(@entity) %></li>
+  </ul>
+
+  <figure role="group" class="preview">
+    <%= profile_avatar @entity.user %>
+    <figcaption>
+      <%= user_link(@entity.user) %>
+    </figcaption>
+  </figure>
+
+  <dl>
+    <dt><%= t('activerecord.attributes.foreign_user.foreign_site') %></dt>
+    <dd><%= @entity.foreign_site.name %></dd>
+
+    <dt><%= t('activerecord.attributes.foreign_user.slug') %></dt>
+    <dd><%= @entity.slug %></dd>
+
+    <dt><%= t('activerecord.attributes.foreign_user.user') %></dt>
+    <dd><%= admin_user_link(@entity.user) %></dd>
+
+    <% unless @entity.name.blank? %>
+      <dt><%= t('activerecord.attributes.foreign_user.name') %></dt>
+      <dd><%= @entity.name %></dd>
+    <% end %>
+
+    <% unless @entity.email.blank? %>
+      <dt><%= t('activerecord.attributes.foreign_user.email') %></dt>
+      <dd><%= link_to @entity.email, "mailto:#{@entity.email}" %></dd>
+    <% end %>
+
+    <% unless @entity.ip.blank? %>
+      <dt><%= t('activerecord.attributes.foreign_user.ip') %></dt>
+      <dd><%= @entity.ip %></dd>
+    <% end %>
+
+    <% unless @entity.agent.blank? %>
+      <dt><%= t('activerecord.attributes.foreign_user.agent') %></dt>
+      <dd><%= @entity.agent.name %></dd>
+    <% end %>
+
+    <dt><%= t(:created_at) %></dt>
+    <dd><%= time_tag @entity.created_at %></dd>
+
+    <dt><%= t('activerecord.attributes.foreign_user.data') %></dt>
+    <dd>
+      <% JSON.parse(@entity.data).each do |k, v| %>
+        <%= "#{k}: #{v}" %><br/>
+      <% end %>
+    </dd>
+  </dl>
+</article>

data/app/views/admin/index/dashboard/_biovision_user.html.erb

@@ -3,6 +3,7 @@
     <div class="heading"><%= t('.heading') %></div>
     <ul>
       <li><%= render 'admin/users/nav_item' %></li>
+      <li><%= render 'admin/foreign_users/nav_item' %></li>
       <li><%= render 'admin/privileges/nav_item' %></li>
       <li><%= render 'admin/privilege_groups/nav_item' %></li>
       <li><%= render 'admin/login_attempts/nav_item' %></li>

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

@@ -33,6 +33,14 @@
       <%= admin_user_link(entity.inviter) %>
     </div>
   <% end %>
+  <% if entity.foreign_users.any? %>
+    <div class="secondary info">
+      <%= t('.foreign_users') %>:
+      <% entity.foreign_users.each do |foreign_user| %>
+        <%= admin_foreign_user_link(foreign_user) %><br/>
+      <% end %>
+    </div>
+  <% end %>
 
   <%=
     render(

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

@@ -89,6 +89,17 @@
       <dd><%= time_tag @entity.last_seen %></dd>
     <% end %>
 
+    <% if @entity.foreign_users.any? %>
+      <dt><%= t('admin.users.entity.in_list.foreign_users') %></dt>
+      <dd>
+        <ul>
+          <% @entity.foreign_users.each do |foreign_user| %>
+            <li><%= admin_foreign_user_link(foreign_user) %></li>
+          <% end %>
+        </ul>
+      </dd>
+    <% end %>
+
     <% if @entity.user_privileges.any? %>
       <dt><%= t('.privileges') %></dt>
       <dd>

data/app/views/media_files/medium.jbuilder

@@ -0,0 +1,13 @@
+json.data do
+  json.id @entity.id
+  json.type @entity.class.table_name
+  json.attributes do
+    json.(@entity, :name)
+  end
+  json.meta do
+    json.file do
+      json.large @entity.file.medium_2x.url
+      json.medium @entity.file.medium.url
+    end
+  end
+end

data/app/views/shared/forms/_state_container.html.erb

@@ -0,0 +1,6 @@
+<div class="loading_message hidden">
+  <div><%= t('.saving') %></div>
+  <div class="state_container">
+    <progress value="0"></progress>
+  </div>
+</div>

data/config/locales/common-en.yml

@@ -109,6 +109,9 @@ en:
       site_name: "example.com"
       twitter_site: ""
       twitter_creator: ""
+    forms:
+      state_container:
+        saving: "Saving..."
   admin:
     index:
       index:

data/config/locales/common-ru.yml

@@ -110,6 +110,9 @@ ru:
       site_name: "example.com"
       twitter_site: ""
       twitter_creator: ""
+    forms:
+      state_container:
+        saving: "Сохранение…"
   admin:
     index:
       index:

data/config/locales/common-sv.yml

@@ -109,6 +109,9 @@ sv:
       site_name: "example.com"
       twitter_site: ""
       twitter_creator: ""
+    forms:
+      state_container:
+        saving: "Sparar..."
   admin:
     index:
       index:

data/config/locales/users-en.yml

@@ -130,6 +130,15 @@ en:
         user: "User"
         password: "Password"
   admin:
+    foreign_users:
+      nav_item:
+        description: "Manage foreign users (authentication via Facebook, Google, etc.)"
+        text: "Foreign users"
+      index:
+        heading: "Foreign users"
+        title: "Foreign users, page %{page}"
+      show:
+        title: "Foreign user %{slug}"
     users:
       nav_item:
         text: "Users"
@@ -152,6 +161,9 @@ en:
         heading: "Privileges of user"
       filter:
         search: "Search"
+      entity:
+        in_list:
+          foreign_users: "Foreign users"
     tokens:
       nav_item:
         text: "Access tokens (user sessions)"
@@ -393,3 +405,6 @@ en:
       greeting: "Hello %{name}"
       message: "Someone is trying to log in to your account. For security reasons logging in for your account is suspended for 15 minutes."
       you_can_recover_password: "If you forgot your password, you can reset it by following this link"
+  foreign_users:
+    destroy:
+      success: "Foreign user has been deleted"

data/config/locales/users-ru.yml

@@ -130,6 +130,15 @@ ru:
         user: "Пользователь"
         password: "Пароль"
   admin:
+    foreign_users:
+      nav_item:
+        description: "Управление внешними пользователями (авторизация через Facebook, Google и так далее)"
+        text: "Внешние пользователи"
+      index:
+        heading: "Внешние пользователи"
+        title: "Внешние пользователи, страница %{page}"
+      show:
+        title: "Внешний пользователь %{slug}"
     users:
       nav_item:
         text: "Пользователи"
@@ -152,6 +161,9 @@ ru:
         heading: "Привилегии пользователя"
       filter:
         search: "Искать"
+      entity:
+        in_list:
+          foreign_users: "Внешние пользователи"
     tokens:
       nav_item:
         text: "Жетоны доступа (сессии пользователей)"
@@ -393,3 +405,6 @@ ru:
       greeting: "Здравствуйте, %{name}"
       message: "Кто-то бесуспешно пытается войти от вашего имени. В целях безопасности возможность входа заблокирована на 15 минут."
       you_can_recover_password: "Если это вы забыли свой пароль, его можно восстановить по этой ссылке"
+  foreign_users:
+    destroy:
+      success: "Сторонний пользователь успешно удалён"

data/config/locales/users-sv.yml

@@ -130,6 +130,15 @@ sv:
         user: "Användare"
         password: "Lösenord"
   admin:
+    foreign_users:
+      nav_item:
+        description: "Hantera utländska användare (autentisering via Facebook, Google, etc.)"
+        text: "Utländska användare"
+      index:
+        heading: "Utländska användare"
+        title: "Utländska användare, sida %{page}"
+      show:
+        title: "Utländsk användare %{slug}"
     users:
       nav_item:
         text: "Användares"
@@ -152,6 +161,9 @@ sv:
         heading: "Privilegiums av användare"
       filter:
         search: "Sök"
+      entity:
+        in_list:
+          foreign_users: "Utländska användare"
     tokens:
       nav_item:
         text: "Tillgång teckens (användarsessioner)"
@@ -393,3 +405,6 @@ sv:
       greeting: "Hallå %{name}"
       message: "Någon försöker logga in på ditt konto. Av säkerhetsskäl inloggas ditt konto i 15 minuter."
       you_can_recover_password: "Om du glömde ditt lösenord kan du återställa det genom att följa den här länken"
+  foreign_users:
+    destroy:
+      success: "Utländsk användare har tagits bort"

data/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
   resources :stored_values, only: %i[update destroy]
 
   resources :users, only: %i[update destroy]
+  resources :foreign_users, only: :destroy
   resources :tokens, :codes, only: %i[update destroy]
 
   resources :metrics, only: :update
@@ -119,6 +120,8 @@ Rails.application.routes.draw do
         end
       end
 
+      resources :foreign_users, only: %i[index show]
+
       resources :login_attempts, only: :index
 
       resources :media_folders, only: %i[index show] do
@@ -152,6 +155,10 @@ Rails.application.routes.draw do
       end
     end
 
+    # namespace :api, defaults: { format: :json } do
+    #   get 'embed' => 'embed#index'
+    # end
+
     namespace :my do
       get '/' => 'index#index'
 
@@ -199,6 +206,8 @@ Rails.application.routes.draw do
     resources :media_files, except: %i[index show update destroy] do
       collection do
         post :ckeditor
+        post :medium, defaults: { format: :json }
+        post :medium_jquery, defaults: { format: :json }
       end
     end
 

data/lib/biovision/base/base_methods.rb

@@ -53,7 +53,7 @@ module Biovision
         if current_user.nil?
           "#{request.env['HTTP_X_REAL_IP'] || request.remote_ip}:#{agent.id}"
         else
-          current_user.id
+          current_user.id.to_s
         end
       end
 
@@ -85,6 +85,17 @@ module Biovision
         handle_http_error(message, metric || default_metric, view, status)
       end
 
+      # Handle HTTP error with status 503 without raising exception
+      #
+      # @param [String] message
+      # @param [String] metric
+      # @param [Symbol|String] view
+      def handle_http_503(message, metric = nil, view = :service_unavailable)
+        status         = :service_unavailable
+        default_metric = Metric::METRIC_HTTP_503
+        handle_http_error(message, metric || default_metric, view, status)
+      end
+
       # Handle generic HTTP error without raising exception
       #
       # @param [String] message

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.20.180731.0'
+    VERSION = '0.21.180812.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.20.180731.0
+  version: 0.21.180812.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -222,6 +222,7 @@ files:
 - app/controllers/admin/editable_blocks_controller.rb
 - app/controllers/admin/editable_pages_controller.rb
 - app/controllers/admin/feedback_requests_controller.rb
+- app/controllers/admin/foreign_users_controller.rb
 - app/controllers/admin/index_controller.rb
 - app/controllers/admin/link_block_items_controller.rb
 - app/controllers/admin/link_blocks_controller.rb
@@ -236,6 +237,7 @@ files:
 - app/controllers/admin/users_controller.rb
 - app/controllers/admin_controller.rb
 - app/controllers/agents_controller.rb
+- app/controllers/api/embed_controller.rb
 - app/controllers/authentication_controller.rb
 - app/controllers/browsers_controller.rb
 - app/controllers/codes_controller.rb
@@ -249,6 +251,7 @@ files:
 - app/controllers/errors_controller.rb
 - app/controllers/fallback_controller.rb
 - app/controllers/feedback_requests_controller.rb
+- app/controllers/foreign_users_controller.rb
 - app/controllers/index_controller.rb
 - app/controllers/link_block_items_controller.rb
 - app/controllers/link_blocks_controller.rb
@@ -359,6 +362,10 @@ files:
 - app/views/admin/feedback_requests/_nav_item.html.erb
 - app/views/admin/feedback_requests/entity/_in_list.html.erb
 - app/views/admin/feedback_requests/index.html.erb
+- app/views/admin/foreign_users/_nav_item.html.erb
+- app/views/admin/foreign_users/entity/_in_list.html.erb
+- app/views/admin/foreign_users/index.html.erb
+- app/views/admin/foreign_users/show.html.erb
 - app/views/admin/index/_biovision_base.html.erb
 - app/views/admin/index/_custom_dashboard.html.erb
 - app/views/admin/index/dashboard/_biovision_feedback.html.erb
@@ -508,6 +515,7 @@ files:
 - app/views/media_files/ckeditor.html.erb
 - app/views/media_files/edit.html.erb
 - app/views/media_files/edit.js.erb
+- app/views/media_files/medium.jbuilder
 - app/views/media_files/new.html.erb
 - app/views/media_files/new.js.erb
 - app/views/media_folders/_form.html.erb
@@ -571,6 +579,7 @@ files:
 - app/views/shared/filter/_flag.html.erb
 - app/views/shared/forms/_entity_flags.html.erb
 - app/views/shared/forms/_image_remover.html.erb
+- app/views/shared/forms/_state_container.html.erb
 - app/views/shared/forms/_wysiwyg.html.erb
 - app/views/shared/forms/check.jbuilder
 - app/views/shared/forms/errors.js.erb