symphonia 4.1.3 → 5.0.0

data/app/helpers/symphonia/application_helper.rb

@@ -1,7 +1,6 @@
-# require 'symphonia/bootstrap_link_render'
 module Symphonia
   module ApplicationHelper
-    include FontAwesome::Rails::IconHelper
+
     include FormHelper
 
     def bootstrap_class_for(flash_type)
@@ -23,8 +22,8 @@ module Symphonia
     def render_flash_messages(flash_messages = nil)
       s = ''
       Array(flash_messages || flash).each do |type, message|
-        s << content_tag(:div, class: "d-print-none alert #{bootstrap_class_for(type)}") do
-          content_tag(:button, '', class: 'fa fa-times-circle-o close', data: { dismiss: 'alert' }) + Array.wrap(message).collect { |m| fa_icon(type, text: m) }.join("<br>").html_safe
+        s << tag.div(class: "d-print-none alert #{bootstrap_class_for(type)}") do
+          tag.button('', class: 'fa fa-circle-xmark close', data: { dismiss: 'alert' }) + Array.wrap(message).collect { |m| icon(type, text: m) }.join("<br>").html_safe
         end
       end
 
@@ -38,11 +37,13 @@ module Symphonia
       end
       options[:container_class] ||= 'mr-auto'
 
-      content_tag(:ul, s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
+      tag.ul(s.html_safe, itemscope: '', itemtype: 'http://schema.org/BreadcrumbList', class: "navbar-nav #{options[:container_class]}", id: menu.to_s)
     end
 
     def render_menu_node(menu, item, options = {})
       condition = item[:if] ? item[:if].call : true
+      return nil unless condition
+
       selected = @menu_item.to_sym == menu
       label = case item[:label].class.name
               when 'NilClass'
@@ -57,16 +58,16 @@ module Symphonia
                 raise "MenuManager error: Label is unknown type: #{item[:label].class}"
               end
       if item[:children].blank?
-        return content_tag(:li, render_menu_link(item, label, options), class: "nav-item #{menu} #{'active' if selected} #{options[:class]}", id: item[:id]) if condition
+        tag.li(render_menu_link(item, label, options), class: "nav-item #{menu} #{'active' if selected} #{options[:class]}", id: item[:id])
       else
         children = ''
         item[:children].each do |child, subitem|
           children << render_menu_node(menu, subitem, class: 'dropdown-item').to_s
         end
-        unless children.blank?
-          return content_tag(:li, class: "nav-item dropdown #{menu}") do
+        if children.present?
+          tag.li(class: "nav-item dropdown #{menu}") do
             concat render_menu_link(item.merge({ class: 'dropdown-toggle', data: { toggle: 'dropdown' } }), label, { is_submenu: true })
-            concat content_tag(:ul, children.html_safe, class: 'dropdown-menu')
+            concat tag.ul(children.html_safe, class: 'dropdown-menu')
           end
         end
       end
@@ -87,7 +88,7 @@ module Symphonia
               item[:url]
             end
       link_to(
-        (content_tag(:i, '', class: "#{item[:icon]}") + "\n" + content_tag(:span, label, itemprop: 'title')).html_safe,
+        (tag.i('', class: "#{item[:icon]}") + "\n" + tag.span(label, itemprop: 'title')).html_safe,
         url,
         class: "nav-link #{item[:class]}",
         data: item[:data],
@@ -133,20 +134,21 @@ module Symphonia
         ''
       else
         html_title(header_text.dup)
-        header_text << "\n" + content_tag(:small, small, class: 'text-muted') if small.present?
+        header_text << ("\n" << tag.small(small, class: 'text-muted')) if small.present?
         s = ''
         if options[:back] && !request.xhr?
           back_url = options[:back] unless options[:back].is_a? TrueClass
           s << link_to_back(back_url)
         end
         s << capture(&block).to_s if block_given?
-        header_tag = content_tag request.xhr? && :h5 || :h1, id: 'page_header', class: s.present? && "col-6" || nil do
+        header_class = (s.present? && "col-6") || nil
+        header_tag = content_tag(((request.xhr? && :h5) || :h1), id: 'page_header', class: header_class) do
           header_text.html_safe
         end
         return header_tag if s.blank?
 
-        content_tag :div, class: "row" do
-          header_tag + content_tag(:div, s.html_safe, class: "col-6 text-right")
+        tag.div(class: "row") do
+          header_tag + tag.div(s.html_safe, class: "col-6 text-right")
         end
       end
     end
@@ -154,7 +156,7 @@ module Symphonia
     alias_method :page_header, :title
 
     def render_no_data(message = nil)
-      content_tag(:div, message || t(:text_no_data), class: 'nodata')
+      tag.div(icon("circle-info", text: message || t(:text_no_data)), class: 'alert alert-info text-center nodata')
     end
 
     def content_for(name, content = nil, &block)
@@ -175,7 +177,7 @@ module Symphonia
     end
 
     def format_html(text)
-      content_tag(:div, (defined?(Ckeditor) ? text.html_safe : format_text(text)), class: 'formatted-text')
+      tag.div((defined?(Ckeditor) ? text.html_safe : format_text(text)), class: 'formatted-text')
     end
 
     def format_price(value, options = {})
@@ -183,7 +185,7 @@ module Symphonia
     end
 
     def multiselect_toggler(id = nil)
-      link_to(fa_icon(:plus), 'javascript:void(0);', onclick: "toggleMultiSelect(#{id || 'this'});return false", class: 'btn fa fa-border')
+      link_to(icon('plus'), 'javascript:void(0);', onclick: "toggleMultiSelect(#{id || 'this'});return false", class: 'btn fa fa-border')
     end
 
     def link_to_back(url = nil)
@@ -191,14 +193,12 @@ module Symphonia
     end
 
     def link_to_new_entity(options = {})
-      return '' if !options.has_key?(:skip_permission_check) && !User.current.allowed_to?(:"manage_#{controller_name}")
-
       anchor = options.has_key?(:anchor) ? options.delete(:anchor) : 'page_header'
       label = options.delete(:label) || t("label_#{controller_name.singularize}_new")
       model = controller.try(:model) || controller_name.singularize
       url = options.delete(:url) || new_polymorphic_path(model, anchor: anchor)
 
-      link_to(fa_icon('add', text: label), url, { class: 'btn btn-primary' }.merge(options))
+      link_to(icon('square-plus', text: label), url, { class: 'btn btn-primary' }.merge(options))
     end
 
     # change the default link renderer for will_paginate
@@ -238,8 +238,30 @@ module Symphonia
       javascript_tag("$(document).ready(function() {#{js.html_safe}})".html_safe)
     end
 
-    def icon(fa, text = nil, **options)
-      fa_icon(fa, (text && { text: content_tag(:span, text, class: 'd-none d-sm-inline') } || {}).merge(options))
+    # prepend FontAwesome::Sass::Rails::ViewHelpers
+    def icon(icon, text = nil, html_options = {})
+      if text.is_a?(Hash)
+        html_options = text
+        text = nil
+      end
+
+      text_content = if text
+                       tag.span(text, class: 'd-none d-sm-inline')
+                     elsif html_options[:text]
+                       html_options.delete(:text)
+                     end
+      html_options[:title] ||= text
+      html_options[:class] = "fa-regular fa-#{icon}"
+      html_options['aria-hidden'] ||= true
+
+      html = tag.i(nil, **html_options)
+      html << ' ' << text_content.to_s if text_content.present?
+      html
+    end
+
+    def fa_icon(fa, options = {})
+      ActiveSupport::Deprecation.warn "use `icon` instead"
+      icon(fa, options.delete(:text), options)
     end
 
     # Render original template from engine
@@ -332,11 +354,11 @@ module Symphonia
 
       def to_html
         html = "<div id='#{@modal_id}' style='' class='modal fade' role='dialog'><div class='modal-dialog #{'modal-lg' if size.present?}'><div class='modal-content'>"
-        html << @c.content_tag(:div, class: 'modal-header') do
-          @c.content_tag(:button, '', class: 'close fa fa-times', data: { dismiss: 'modal' }, 'aria-hidden' => true) + @c.content_tag(:h4, @title, class: 'modal-title') + @header.to_s
+        html << @c.tag.div(class: 'modal-header') do
+          @c.tag.button('', class: 'close fa fa-times', data: { dismiss: 'modal' }, 'aria-hidden' => true) + @c.tag.h4(@title, class: 'modal-title') + @header.to_s
         end
-        content = @c.content_tag(:div, @c.content_tag(:div, body.html_safe, class: 'modal-content-inner-container container-fluid'), class: 'modal-body')
-        content << @c.content_tag(:div, footer.html_safe, class: 'modal-footer')
+        content = @c.tag.div(@c.tag.div(body.html_safe, class: 'modal-content-inner-container container-fluid'), class: 'modal-body')
+        content << @c.tag.div(footer.html_safe, class: 'modal-footer')
 
         html << content.html_safe
         html << '</div></div></div>'

data/app/models/symphonia/preference.rb

@@ -3,10 +3,10 @@ module Symphonia
     self.table_name = 'preferences'
 
     validates :name, uniqueness: true
-    # has_and_belongs_to_many :symphonia_units, association_foreign_key: 'user_id'
-    has_and_belongs_to_many :users, join_table: 'preferences_users', association_foreign_key: 'user_id', class_name: 'Symphonia::User'
+    has_and_belongs_to_many :users, join_table: 'preferences_users', association_foreign_key: 'user_id',
+                                    class_name: 'Symphonia::User'
 
-    scope :visible, ->(user = Symphonia::User.current) { user.admin? ? all : where(restrict: false)}
-  end
+    scope :visible, ->(user = Symphonia::User.current) { user.admin? ? all : where(restrict: false) }
 
-end
+  end
+end

data/app/models/symphonia/user.rb

@@ -11,7 +11,6 @@ module Symphonia
       add_attribute :last_name
       add_attribute :email, :mail, default: true
       add_attribute :status, :enum, filter: "select"
-      add_attribute :role, :reference
       add_attribute :admin, :boolean
       add_attribute :login_count
       add_attribute :last_login_ip
@@ -34,8 +33,7 @@ module Symphonia
 
     has_and_belongs_to_many :preferences, foreign_key: 'user_id'
 
-    belongs_to :edited_by, class_name: 'Symphonia::User', required: false
-    belongs_to :role, required: false
+    belongs_to :edited_by, class_name: 'Symphonia::User', optional: true
 
     accepts_nested_attributes_for :preferences
 
@@ -46,29 +44,6 @@ module Symphonia
 
     alias_attribute :mail, :email
 
-
-    before_save do |model|
-      Rails.cache.delete_matched('user_allowed_to*') if model.role_id_changed?
-    end
-
-    def allowed_to?(action)
-      return true if admin?
-
-      Rails.cache.fetch([:user_allowed_to, self, action]) do
-        role_id && role.allowed_to?(action)
-      end
-    end
-
-    def authorize?(controller, action)
-      return true if admin?
-
-      if role_id
-        role.authorize?(controller, action)
-      else
-        false
-      end
-    end
-
     # def form_path
     #   'symphonia/users/form'
     # end
@@ -97,14 +72,6 @@ module Symphonia
         'anonym@nothing'
       end
 
-      def allowed_to?(_action)
-        false
-      end
-
-      def authorize?(_controller, _action)
-        false
-      end
-
       def save
         false
       end
@@ -117,7 +84,7 @@ module Symphonia
         false
       end
 
-      alias_method :admin?, :admin
+      alias admin? admin
 
       def logged_in?
         false
@@ -130,6 +97,7 @@ module Symphonia
       def language
         nil
       end
+
     end
 
   end

data/app/models/symphonia/user_ability.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Symphonia
+  class UserAbility
+    include CanCan::Ability
+
+    def initialize(user)
+      return unless user.logged_in?
+
+      can :update, User, id: user.id
+      can :read, User, id: user.id
+      return unless user.admin?
+
+      can :archive, User, status: :active
+      can :activate, User, status: :pending
+      can :unarchive, User, status: :archived
+
+      can %i[read create update destroy], :all
+      # Define abilities for the user here. For example:
+      #
+      #   return unless user.present?
+      #   can :read, :all
+      #   return unless user.admin?
+      #   can :manage, :all
+      #
+      # The first argument to `can` is the action you are giving the user
+      # permission to do.
+      # If you pass :manage it will apply to every action. Other common actions
+      # here are :read, :create, :update and :destroy.
+      #
+      # The second argument is the resource the user can perform the action on.
+      # If you pass :all it will apply to every resource. Otherwise pass a Ruby
+      # class of the resource.
+      #
+      # The third argument is an optional hash of conditions to further filter the
+      # objects.
+      # For example, here the user can only update published articles.
+      #
+      #   can :update, Article, published: true
+      #
+      # See the wiki for details:
+      # https://github.com/CanCanCommunity/cancancan/blob/develop/docs/define_check_abilities.md
+    end
+
+  end
+end

data/app/views/common/403.html.erb

@@ -1,5 +1,6 @@
-<i class="fa fa-hand-stop-o fa-5x pull-left"></i> <%= page_header 403 %>
-<p class="clearfix">
+<%= page_header 403 %>
+<p class="alert alert-danger">
+  <i class="fa fa-hand-stop-o fa-5x"></i>
   <%= t :text_access_deny %>
 </p>
-<%= link_to icon('back', t(:button_back)), :back, class: 'btn btn-link' %>
+<%= link_to icon('back', t(:button_back)), :back, class: 'btn btn-link' %>

data/app/views/layouts/symphonia/application.html.erb

@@ -8,9 +8,9 @@
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true %>
     <%= yield :stylesheet_tags %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': true %>
-    <script type="text/javascript">
-      Symphonia.routes.reorderImagesPath = '<%= symphonia.reorder_attachment_path %>';
-    </script>
+<!--    <script type="text/javascript">-->
+<!--      Symphonia.routes.reorderImagesPath = '<%#= symphonia.reorder_attachment_path %>';-->
+<!--    </script>-->
     <%= yield :javascript_tags %>
     <%= csrf_meta_tags %>
   </head>
@@ -19,7 +19,7 @@
       <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
         <!--<a class="navbar-brand" href="#">Navbar</a>-->
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-          <%= fa_icon('bars') %>
+          <%= icon('bars') %>
         </button>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">

data/app/views/symphonia/accounts/_detail.html.erb

@@ -1,16 +1,17 @@
+<%= ActiveSupport::Deprecation.warn "View 'accounts/_detail' partial should not use anymore" %>
 <div class="buttons contextual">
   <% if Symphonia::User.current.admin? %>
     <% controller = account.class.name.underscore.pluralize %>
     <%= link_to(icon('edit', t(:button_edit)), edit_polymorphic_path(account), class: 'btn btn-primary') %>
     <% if use_service_buttons %>
       <% if account.active? %>
-        <%= link_to(fa_icon('lock', text: t(:button_archive)), {:controller => controller, :action => 'archive', :id => account, :back_url => polymorphic_path(account)}, :class => 'btn btn-secondary', :data => {:method => 'post', :confirm => t(:text_are_you_sure)}) %>
+        <%#= link_to(icon('lock', text: t(:button_archive)), polymorphic_path([controller_name, 'archive', account], back_url: polymorphic_path(account)), class: 'btn btn-secondary', data: { method: 'post', confirm: t(:text_are_you_sure) }) %>
       <% elsif account.status_new? %>
-        <%= link_to(fa_icon('bolt', text: t(:button_active)), {:controller => controller, :action => 'unarchive', :id => account, :back_url => polymorphic_path(account)}, :class => 'btn btn-secondary', :data => {:method => 'post', :confirm => t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}"}) %>
+        <%= link_to(icon('bolt', text: t(:button_active)), { controller: controller, action: 'unarchive', id: account, back_url: polymorphic_path(account) }, class: 'btn btn-secondary', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
       <% else %>
-        <%= link_to(fa_icon('unlock', text: t(:button_unarchive)), {:controller => controller, :action => 'unarchive', :id => account, :back_url => polymorphic_path(account)}, :class => 'btn btn-secondary', :data => {:method => 'post', :confirm => t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}"}) %>
+        <%= link_to(icon('unlock', text: t(:button_unarchive)), { controller: controller, action: 'unarchive', id: account, back_url: polymorphic_path(account) }, class: 'btn btn-secondary', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
       <% end %>
-      <%= link_to(fa_icon('delete', text: t(:button_delete)), account, :class => 'btn btn-danger', :method => 'delete', :data => {:confirm => t(:text_are_you_sure)}) %>
+      <%= link_to(icon('delete', text: t(:button_delete)), account, class: 'btn btn-danger', method: 'delete', data: { :confirm => t(:text_are_you_sure) }) %>
     <% end -%>
   <% else %>
     <%= link_to(icon('edit', t(:button_edit)), edit_polymorphic_path(controller_name.singularize, id: account.id), :class => 'btn btn-primary', :remote => true) %>
@@ -24,29 +25,31 @@
   <div class="col-md-4">
     <div class="row">
       <div class="col-md-6"><b><%= account.class.human_attribute_name(:login) %></b></div>
-      <div class="col-md-6"><span ><%= account.login %></span></div>
+      <div class="col-md-6"><span><%= account.login %></span></div>
     </div>
   </div>
   <div class="col-md-4">
     <div class="row">
       <div class="col-md-6"><b><%= account.class.human_attribute_name(:email) %></b></div>
-      <div class="col-md-6"><span ><%= account.format_value(:email, self) %></span></div>
+      <div class="col-md-6"><span><%= account.format_value(:email, self) %></span></div>
     </div>
   </div>
 </div>
 
 <div id="customer_detail" style="display: none">
   <div class="clearfix">
-    <%= content_tag(:strong, account.class.human_attribute_name(:current_login_at), :class => 'col-xs-6') %>
-    <%= content_tag(:div, account.current_login_at ? time_tag(account.current_login_at) : '-', :class => 'col-xs-6') %>
-    <%= content_tag(:strong, account.class.human_attribute_name(:current_login_ip), :class => 'col-xs-6') %>
-    <%= content_tag(:div, account.current_login_ip || '-', :class => 'col-xs-6') %>
-    <%= content_tag(:strong, account.class.human_attribute_name(:last_login_at), :class => 'col-xs-6') %>
-    <%= content_tag(:div, account.last_login_at ? time_tag(account.last_login_at.localtime) : '-', :class => 'col-xs-6') %>
-    <%= content_tag(:strong, account.class.human_attribute_name(:last_login_ip), :class => 'col-xs-6') %>
-    <%= content_tag(:div, account.last_login_ip || '-', :class => 'col-xs-6') %>
-    <%= content_tag(:strong, account.class.human_attribute_name(:single_access_token), :class => 'col-xs-6') %>
-    <%= content_tag(:div, text_field_tag(:token, account.single_access_token, :style => 'border:none'), :class => 'col-xs-6') %>
+    <b class="col-xs-6"><%= account.class.human_attribute_name(:current_login_at) %></b>
+    <div class="col-xs-6"><%= account.current_login_at ? time_tag(account.current_login_at) : '-' %></div>
+    <b class="col-xs-6"><%= account.class.human_attribute_name(:current_login_ip) %></b>
+    <div class="col-xs-6"><%= account.current_login_ip || '-' %></div>
+    <b class="col-xs-6"><%= account.class.human_attribute_name(:last_login_at) %></b>
+    <div class="col-xs-6"><%= account.last_login_at ? time_tag(account.last_login_at.localtime) : '-' %></div>
+    <b class="col-xs-6"><%= account.class.human_attribute_name(:last_login_ip) %></b>
+    <div class="col-xs-6"><%= account.last_login_ip || '-' %></div>
+    <b class="col-xs-6"><%= account.class.human_attribute_name(:single_access_token) %></b>
+    <div class="col-xs-6">
+      <%= text_field_tag(:token, account.single_access_token, style: 'border:none') %>
+    </div>
   </div>
 </div>
 
@@ -54,7 +57,7 @@
   SymphoniaUserDetail = {
     popup: {
       dialog: null,
-      show: function() {
+      show: function () {
         if (!this.dialog) {
           this.dialog = new SymphoniaDialog("customer_detail");
         }
@@ -62,4 +65,4 @@
       }
     }
   };
-</script>
+</script>

data/app/views/symphonia/common/_filters.html.erb

@@ -1,23 +1,23 @@
 <% if @query %>
   <%#= bootstrap_form_tag(url: {set_filter: 1}, method: :get, class: 'form-horizontal', id: 'symphonia_filters_form') do |f| %>
-    <div class="row hidden-print">
-      <% if @query.search? %>
-        <div class="col-sm-12">
-          <div class="input-group input-group-sm">
-            <%= search_field_tag(:q, params[:q], class: 'form-control input-sm', id: 'symphonia_query_q', placeholder: t(:label_search), autofocus: params[:q].present? || nil, data: {remote: local_assigns[:remote]}, onchange: 'submitSymphoniaQueryQ(this)') %>
-            <div class="input-group-append">
-              <div class="input-group-text">
-                <%= link_to(fa_icon('search'), 'javascript:void(0)', {onclick: 'Symphonia.filters.search(document.getElementById("symphonia_query_q"))', title: t(:button_search)}) %>
-                <%= link_to(fa_icon('filter'), symphonia.filters_options_path(@query.model.name, @query.to_params.merge(path: j(request.url))), remote: true, title: t(:title_advanced_filters)) unless local_assigns.key?(:hide_advanced_filter) %>
-                <%= link_to(fa_icon('false'), 'javascript:void(0)', onclick: 'Symphonia.filters.resetSearch(document.getElementById("symphonia_query_q"))') if params[:q] %>
-              </div>
-
+  <div class="row hidden-print">
+    <% if @query.search? %>
+      <div class="col-sm-12">
+        <div class="input-group input-group-sm">
+          <%= search_field_tag(:q, params[:q], class: 'form-control input-sm', id: 'symphonia_query_q', placeholder: t(:label_search), autofocus: params[:q].present? || nil, data: { remote: local_assigns[:remote] }, onchange: 'submitSymphoniaQueryQ(this)') %>
+          <div class="input-group-append">
+            <div class="input-group-text">
+              <%= link_to(icon('search'), 'javascript:void(0)', { onclick: 'Symphonia.filters.search(document.getElementById("symphonia_query_q"))', title: t(:button_search) }) %>
+              <%= link_to(icon('filter'), symphonia.filters_options_path(@query.model.name, @query.to_params.merge(path: j(request.url))), remote: true, title: t(:title_advanced_filters)) unless local_assigns.key?(:hide_advanced_filter) %>
+              <%= link_to(icon('false'), 'javascript:void(0)', onclick: 'Symphonia.filters.resetSearch(document.getElementById("symphonia_query_q"))') if params[:q] %>
             </div>
+
           </div>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
+  </div>
   <%# end %>
 <% else %>
-  <%= content_tag(:p, t(:text_error_query_not_init), class: 'no-data') %>
+  <%= render_no_data t(:text_error_query_not_init) %>
 <% end -%>

data/app/views/symphonia/common/_share_links.html.erb

@@ -1,5 +1,4 @@
 <span class="share-buttons">
-  <%= link_to(fa_icon("facebook-square #{icon_css}"), "http://www.facebook.com/share.php?u=#{url}&title=#{name}", :title => t(:facebook, :scope => [:share_on, :title]),  :target => '_blank') %>
-  <%= link_to(fa_icon("twitter-square #{icon_css}"), "http://twitter.com/home?status=#{name}+#{url}", :title => t(:twitter, :scope => [:share_on, :title]), :target => '_blank') %>
-  <%= link_to(fa_icon("google-plus-square #{icon_css}"), "https://plus.google.com/share?url=#{url}", :title => t(:google_plus, :scope => [:share_on, :title]), :target => '_blank') %>
+  <%= link_to(icon("facebook-square #{icon_css}"), "http://www.facebook.com/share.php?u=#{url}&title=#{name}", title: t("share_on.title.facebook"), target: '_blank') %>
+  <%= link_to(icon("twitter-square #{icon_css}"), "http://twitter.com/home?status=#{name}+#{url}", title: t("share_on.title.twitter"), target: '_blank') %>
 </span>

data/app/views/symphonia/users/_form.html.erb

@@ -2,12 +2,7 @@
 <% if Symphonia::User.current.admin? %>
   <div class="row justify-content-center">
     <div class="col-8">
-      <%= f.check_box :admin, id: 'user_admin', layout: :inline %>
+      <%= f.check_box :admin, id: 'user_admin' %>
     </div>
-    <% if @roles.any? %>
-      <div class="col-9">
-        <%= f.select(:role_id, options_from_collection_for_select(@roles, :id, :name, selected: @user.role_id), include_blank: true, layout: :horizontal) %>
-      </div>
-    <% end -%>
   </div>
 <% end %>

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

@@ -5,17 +5,12 @@
     <h4 class="card-title"><%= html_title(@user.name).join %></h4>
     <div class="card-text row">
       <div class="col-sm-8">
-        <% %i(login email admin).each do |attribute| %>
+        <% %i[login email admin].each do |attribute| %>
           <% next if @user.send(attribute).to_s.blank? %>
           <dt><%= @user.class.human_attribute_name attribute %></dt>
           <dd><%= @user.format_value(attribute, self) %></dd>
         <% end %>
 
-        <% if @user.role %>
-          <dt><%= @user.class.human_attribute_name :role %></dt>
-          <dd><%= @user.format_value(:role, Symphonia::User.current.admin? && self || nil) %></dd>
-        <% end %>
-
         <% if @user.preferences.any? %>
           <dt><%= t(:label_user_notifications) %></dt>
           <% @user.preferences.each do |p| %>
@@ -25,20 +20,20 @@
       </div>
       <div class="col-sm-4">
 
-        <% if Symphonia::User.current.admin? %>
+        <% if can? :edit, @user %>
           <%= link_to(icon('edit', t(:button_edit)), edit_user_path(@user), class: 'btn btn-primary btn-block') %>
-          <% if true %>
-            <% if @user.active? %>
-              <%= link_to(icon('lock', t(:button_archive)), archive_user_path(@user, back_url: polymorphic_path(@user)), data: { method: 'post', confirm: t(:text_are_you_sure) }, class: 'btn btn-secondary btn-block') %>
-            <% elsif @user.status_new? %>
-              <%= link_to(icon('bolt', t(:button_active)), unarchive_user_path(@user, back_url: polymorphic_path(@user)), class: 'btn btn-secondary', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
-            <% else %>
-              <%= link_to(icon('unlock', t(:button_unarchive)), unarchive_user_path(@user, back_url: polymorphic_path(@user)), class: 'btn btn-secondary btn-block', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
-            <% end %>
-            <%= link_to(icon('delete', t(:button_delete)), @user, class: 'btn btn-danger btn-block', method: 'delete', data: { confirm: t(:text_are_you_sure) }) %>
-          <% end -%>
-        <% else %>
-          <%= link_to(icon('edit', t(:button_edit)), edit_user_path(@user), class: 'btn btn-primary btn-block', remote: true) %>
+        <% end %>
+        <% if can? :archive, @user %>
+          <%= link_to(icon('lock', t(:button_archive)), archive_user_path(@user, back_url: polymorphic_path(@user)), data: { method: 'post', confirm: t(:text_are_you_sure) }, class: 'btn btn-secondary btn-block') %>
+        <% end %>
+        <% if can? :activate, @user %>
+          <%= link_to(icon('bolt', t(:button_active)), unarchive_user_path(@user, back_url: polymorphic_path(@user)), class: 'btn btn-secondary btn-block', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
+        <% end %>
+        <% if can? :unarchive, @user %>
+          <%= link_to(icon('unlock', t(:button_unarchive)), unarchive_user_path(@user, back_url: polymorphic_path(@user)), class: 'btn btn-secondary btn-block', data: { method: 'post', confirm: t(:text_are_you_sure) + "\n  #{t(:text_confirm_send_unlock_mail)}" }) %>
+        <% end %>
+        <% if can? :destroy, @user %>
+          <%= link_to(icon('delete', t(:button_delete)), @user, class: 'btn btn-danger btn-block', method: 'delete', data: { confirm: t(:text_are_you_sure) }) %>
         <% end %>
         <%= link_to(icon('key', t(:detail)), 'javascript:void(0)', onclick: %q{Symphonia.dialog.show('customer_detail')}, class: 'btn btn-info btn-block') %>
       </div>
@@ -60,4 +55,4 @@
     <%= content_tag(:strong, @user.class.human_attribute_name(:single_access_token), :class => 'col-xs-6') %>
     <%= content_tag(:div, text_field_tag(:token, @user.single_access_token, :style => 'border:none'), :class => 'col-xs-6') %>
   </div>
-</div>
+</div>

data/config/locales/cs.yml

@@ -25,8 +25,9 @@ cs:
     present: Současnot
     future: Budoucnost
     formats:
-      default: "%d. %B %Y %H:%M"
+#      default: "%d. %B %Y %H:%M"
       short: "%-d. %-m. %Y %H:%M"
+      long: "%-d. %-m. %Y %H:%M"
   attributes:
     updated_at: Aktualizováno
     created_at: Vytvořeno
@@ -50,7 +51,7 @@ cs:
         attachment: Příloha
       errors:
         template:
-          body: "Formulář obsahuje chybně vyplněná pole:"
+          body: "Formulář obsahuje chyby:"
       attributes:
         attachment:
           attachment_file_name: Název souboru

data/db/migrate/20130714140500_create_users.rb

@@ -37,8 +37,6 @@ class CreateUsers < ActiveRecord::Migration[5.1]
       t.references :edited_by
       t.datetime :edited_at
 
-      t.references :role
-
       t.timestamps
     end
   end

data/db/seeds.rb

@@ -3,11 +3,11 @@ u.attributes = {
   login: 'admin',
   first_name: 'Lukáš',
   last_name: 'Pokorný',
-  email: 'luk4s.pokorny@gmail.com',
+  email: 'admin@luk4s.cz',
   password: 'admin',
   # password_confirmation: 'admin',
   admin: true,
-  avatar_url: "https://secure.gravatar.com/avatar/3657d5f0e9747c1c21eb2b689a8dba0b?s=64"
+  avatar_url: "https://secure.gravatar.com/avatar/3657d5f0e9747c1c21eb2b689a8dba0b?s=64",
 }
 u.single_access_token = SecureRandom.hex(20)
-u.save!(validate: false)
+u.save!(validate: false) if Symphonia::User.where(login: "admin").none?

data/lib/generators/symphonia/entity_controller/entity_controller_generator.rb

@@ -19,7 +19,7 @@ module Generators
     argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
     def create_controller_files
-      template_file = options.api? ? "api_controller.rb" : "controller.rb"
+      template_file = options.api? ? "api_controller.rb.tt" : "controller.rb.tt"
       template template_file, File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
     end
 
@@ -45,4 +45,4 @@ module Generators
 
   end
 end
-end
+end