thecore_ui_rails_admin 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75369cb3f050b4996aafce1b1651216c51db2c3248195a46a5a9e42293372b6e
-  data.tar.gz: 7f72b944c75a1a4a9a36a2633266c977d48638b34a15a6ea8915156b86adcc21
+  metadata.gz: 1a6756ba49af59b55c1fa566eca295c98e52c7580f184e1d45ae0c25a7bd75f4
+  data.tar.gz: ecbfb2985e40f30bb57c3c3a81469cc1d3147c9fdac68d999005dfc162899229
 SHA512:
-  metadata.gz: b81368ff53b4f4362f2318a0949b5be0a673161899c5c4a85433895683f13fbee00dae9bb3cc2137dee5fc56698b7e4983ccd763128eab3d8b7a9b1d4f0c681b
-  data.tar.gz: 72557529214aef7ed4f464309c10846ff0ad57a1f594ed1ecc328a3a940a79eaf37b965e7a40eccf22e14fcfcdf76eed89ab9f5a902f1ec413cfbd7a0146f7fc
+  metadata.gz: e638884d96e59d9d809885cd9a2a7e6a6ecb1cf4cef6a8bb93a17428f1492bd271e71b253a251b53b7c191aa128796fd602b67f7059b48432a832548e979ec97
+  data.tar.gz: 2b248f371c27d01b9189f654351c15a2475383effa6ad47fc6c4c91a177c7c304bb2eb41c95479d25be66406bfa59fb1aab4bbab74b09145a94342fd549d2152

data/app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js

@@ -19,18 +19,6 @@ $(document).on('ready pjax:success', function(e) {
   } else {
     $('.page-header, .content').removeClass('dashboard');
   }
-
-  // $(document).ready(function () {
-  // Hide and show the sidebar
-  // Make the sidebar button shine a bit
-  // setTimeout(function() {
-  //   $('#sidebar-collapse').addClass("flash");
-  // }, 500);
-  // setTimeout(function() {
-  //   if (!$('#wrapper').hasClass('toggled'))
-  //     $('#wrapper').addClass('toggled');
-  // }, 1200);
-  // });
 });
 
 $(function() {
@@ -86,14 +74,4 @@ $(document).ready(function () {
     $('#wrapper').toggleClass('toggled');
   });
 
-  $('textarea[data-richtext="froala-wysiwyg"').froalaEditor();
-//   // Hide and show the sidebar
-//   // Make the sidebar button shine a bit
-//   setTimeout(function() {
-//     $('#sidebar-collapse').addClass("flash");
-//   }, 500);
-//   setTimeout(function() {
-//     if (!$('#wrapper').hasClass('toggled'))
-//       $('#wrapper').addClass('toggled');
-//   }, 1200);
 });

data/app/assets/stylesheets/thecore_ui_rails_admin/thecore.scss

@@ -12,7 +12,6 @@
  *
  *= required _colors
  
- *= require_tree .
  *= require_self
 */
 @import "jquery-ui";

data/app/assets/stylesheets/thecore_ui_rails_admin/thecore_rails_admin.scss

@@ -1,3 +1,21 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= required _colors
+ 
+ *= require_self
+*/
+@import 'thecore';
+@import 'thecore_ui_commons/thecore';
 @import "togglable-sidebar";
 @import "flashing";
 @import 'common';

data/app/assets/stylesheets/thecore_ui_rails_admin/togglable-sidebar.scss

@@ -83,4 +83,8 @@
 
 body.rails_admin .sidebar-nav {
   top: 0px;
+}
+
+.sub-menu a {
+  padding-left: 20px;
 }

data/app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -1,3 +1,3 @@
 -# %ul.sidebar-nav
 - actions(:root).each do |action|
-  %li= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : "", style: "padding-left: 0px;"
+  %li= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : "", style: "padding-left: 0px;text-indent:20px"

data/app/views/layouts/rails_admin/_user_navigation.html.haml

@@ -2,6 +2,6 @@
   -# %ul.sidebar-nav
   %li.dropdown-header=t :current_user
   - if user_link = edit_user_link
-    %li.edit_user_root_link= user_link
+    %li.edit_user_root_link= link_to content_tag('i', "", class: 'fa fa-user', style: 'text-indent: 0') + _current_user.email, show_path(:user, _current_user.id)
   - if logout_path.present?
-    %li=link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-danger'), logout_path, method: logout_method
+    %li=link_to content_tag('i', "", class: 'fa fa-unlink', style: 'text-indent: 0') + t('admin.misc.log_out'), logout_path, method: logout_method

data/app/views/layouts/rails_admin/application.html.haml

@@ -13,12 +13,9 @@
 
     = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
     = javascript_include_tag "rails_admin/rails_admin.js"
+    -# Getting all the assets needed by thecore_rails_admin from all the gems
+    = get_asset_tags_for("thecore_rails_admin")
 
-    - Rails.application.config.assets.paths.each do |p|
-      -# Getting all the assets needed by thecore from all the gems
-      = stylesheet_link_tag("#{p.to_s.split("/").last}/thecore_rails_admin", media: 'all', 'data-turbolinks-track' => true) if File.exists?("#{p}/thecore_rails_admin.scss")
-      = javascript_include_tag("#{Dir["#{p}/**/thecore_rails_admin.js"].first.split("/")[-2]}/thecore_rails_admin", 'data-turbolinks-track' => true) if Dir["#{p}/**/thecore_rails_admin.js"].any?
-    
     = favicon_link_tag 'apple-touch-icon.png', rel: 'apple-touch-icon', sizes: "180x180"
     = favicon_link_tag 'favicon-32x32.png', rel: 'icon', sizes: "32x32"
     = favicon_link_tag 'favicon-16x16.png', rel: 'icon', sizes: "16x16"

data/app/views/rails_admin/main/dashboard.html.haml

@@ -15,7 +15,7 @@
             .text-center
               %p= capitalize_first_letter(abstract_model.config.label_plural)
               %strong= @count[abstract_model.model.name].to_s
-              %p= link_to t('admin.rollincode.show'), index_path, class: 'btn btn-black pjax'
+              %p= link_to content_tag("i", "", class: "fa fa-list-ul"), index_path, class: 'btn btn-black pjax'
         - index += 1
 
 - if @auditing_adapter && authorized?(:history_index)

data/config/initializers/rails_admin.rb

@@ -9,6 +9,26 @@ RailsAdmin.config do |config|
     visible false
   end
 
+  config.model "Predicate" do
+    visible false
+  end
+
+  config.model "Target" do
+    visible false
+  end
+
+  config.model "Action" do
+    visible false
+  end
+
+  config.model "PermissionRole" do
+    visible false
+  end
+
+  config.model "Permission" do
+    visible false
+  end
+
   config.model "ActionText::RichText" do
     visible false
   end
@@ -32,7 +52,7 @@ RailsAdmin.config do |config|
   
   ## == PaperTrail ==
   # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0
-  
+  config.show_gravatar = false
   ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration
   config.label_methods.unshift(:display_name)
   

data/config/initializers/thecore_concern.rb

@@ -12,7 +12,6 @@ module ThecoreConcern
       redirect_to main_app.root_url, :alert => exception.message
     end
     include HttpAcceptLanguage::AutoLocale
-    Rails.logger.debug "Selected Locale: #{I18n.locale}"
     before_action :store_user_location!, if: :storable_location?
     before_action :configure_permitted_parameters, if: :devise_controller?
     before_action :reject_locked!, if: :devise_controller?

data/config/initializers/thecore_ui_rails_admin_app_configs.rb

@@ -1,4 +1,6 @@
 Rails.application.configure do
+    # config.assets.paths << root.join("app", "assets", "stylesheets", "thecore_ui_rails_admin")
+    # config.assets.paths << root.join("app", "assets", "javascripts", "thecore_ui_rails_admin")
     # Login Page and pages not in RailsAdmin
     config.assets.precompile += %w( thecore_ui_rails_admin/thecore.css thecore_ui_rails_admin/thecore.js )
     # Pages under Rails Admin
@@ -9,5 +11,7 @@ Rails.application.configure do
         RailsAdmin::Config::Actions::BulkDelete.send(:include, BulkDeleteConcern)
         RailsAdminSettings::Setting.send(:include, RailsAdminSettings::RailsAdminExtensionConfig)
         User.send(:include, ThecoreUiRailsAdminUser)
+        Role.send(:include, ThecoreUiRailsAdminRole)
+        Permission.send(:include, ThecoreUiRailsAdminPermission)
     end
 end

data/config/locales/thecore_settings.en.yml

@@ -0,0 +1,31 @@
+en:
+  settings:
+    namespaces:
+      main: Main
+    names:
+      app_name: Application Name
+  admin:
+    settings:
+      label: Settings
+      phone_invalid: Invalid Telephone
+      phones_invalid: "Invalid Telephones: %{phones}"
+      email_invalid: Invalid Email
+      yaml_invalid: Invalid Email
+      color_invalid: Invalid Color
+  mongoid: &mongoid
+    models:
+      rails_admin_settings/setting: Configurations
+    attributes:
+      rails_admin_settings/setting:
+        c_at: Created
+        u_at: Modified
+        enabled: Enabled
+        ns: Group
+        name: Name
+        key: Key
+        raw: Value
+        type: Type
+        kind: Type
+        label: Label
+  activerecord:
+    <<: *mongoid

data/config/locales/thecore_settings.it.yml

@@ -7,7 +7,6 @@ it:
   admin:
     settings:
       label: 'Impostazioni'
-      no_ckeditor_detected: CKEditor non trovato — mostro il campo come semplice testo
       phone_invalid: Telefono non valido
       phones_invalid: "Telefono non valido: %{phones}"
       email_invalid: Email non valida

data/lib/abilities/thecore_ui_rails_admin.rb

@@ -2,7 +2,6 @@ module Abilities
     class ThecoreUiRailsAdmin
         include CanCan::Ability
         def initialize user
-            puts "LAMMEEEEEEEEERDAAAAAAAAAAAAAAAAAAAAAAAA"
             # No one is allowed to add or destroy settings
             # just list or edit existing
             cannot :create, RailsAdminSettings::Setting

data/lib/concerns/thecore_ui_rails_admin_permission.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+
+module ThecoreUiRailsAdminPermission
+    extend ActiveSupport::Concern
+    
+    included do
+        
+        rails_admin do
+            field :predicate
+            field :action
+            field :target
+            list do
+                field :created_at
+                exclude_fields :lock_version
+            end
+            show do
+                exclude_fields :id
+                exclude_fields :lock_version
+            end
+            create do
+                field :lock_version, :hidden do
+                    visible true
+                end
+            end
+            edit do
+                field :lock_version, :hidden do
+                    visible true
+                end
+            end
+        end
+    end
+end

data/lib/concerns/thecore_ui_rails_admin_role.rb

@@ -0,0 +1,36 @@
+require 'active_support/concern'
+
+module ThecoreUiRailsAdminRole
+    extend ActiveSupport::Concern
+    
+    included do
+        
+        rails_admin do
+            navigation_label I18n.t("admin.settings.label")
+            navigation_icon 'fa fa-group'
+            desc I18n.t("activerecord.descriptions.role")
+            
+            field :name
+            field :permissions, :selectize
+            list do
+                field :created_at
+                exclude_fields :lock_version
+            end
+            show do
+                exclude_fields :id
+                exclude_fields :lock_version
+            end
+            create do
+                field :lock_version, :hidden do
+                    visible true
+                end
+                # include UserRailsAdminCreateConcern
+            end
+            edit do
+                field :lock_version, :hidden do
+                    visible true
+                end
+            end
+        end
+    end
+end

data/lib/concerns/thecore_ui_rails_admin_user.rb

@@ -5,73 +5,70 @@ module ThecoreUiRailsAdminUser
     
     included do
         
-        RailsAdmin.config do |config|
-            config.model self.name.underscore.capitalize.constantize do
-                # rails_admin do
-                navigation_label I18n.t("admin.settings.label")
-                navigation_icon 'fa fa-user-circle'
-                desc I18n.t("activerecord.descriptions.user")
-                
-                weight 1000
-                # Field present Everywhere
-                field :email do
-                    required true
+        rails_admin do
+            # rails_admin do
+            navigation_label I18n.t("admin.settings.label")
+            navigation_icon 'fa fa-user-circle'
+            desc I18n.t("activerecord.descriptions.user")
+            
+            # Field present Everywhere
+            field :email do
+                required true
+            end
+            field :username do
+                required true
+            end
+            field :admin do
+                visible do
+                    bindings[:view].current_user.admin? && bindings[:view].current_user.id != bindings[:object].id
                 end
-                field :username do
-                    required true
+            end
+            field :locked do
+                visible do
+                    bindings[:view].current_user.admin? && bindings[:view].current_user.id != bindings[:object].id
+                end
+            end
+            field :roles, :selectize
+            # include UserRailsAdminConcern
+            
+            # Fields only in lists and forms
+            list do
+                field :created_at
+                configure :email do
+                    visible false
                 end
-                field :admin do
-                    visible do
-                        bindings[:view].current_user.admin? && bindings[:view].current_user.id != bindings[:object].id
-                    end
+                exclude_fields :lock_version
+                # include UserRailsAdminListConcern
+            end
+            show do
+                #exclude_fields :id
+                exclude_fields :lock_version
+            end
+            create do
+                field :password do
+                    required true
                 end
-                field :locked do
-                    visible do
-                        bindings[:view].current_user.admin? && bindings[:view].current_user.id != bindings[:object].id
-                    end
+                field :password_confirmation do
+                    required true
                 end
-                field :roles
-                # include UserRailsAdminConcern
-                
-                # Fields only in lists and forms
-                list do
-                    field :created_at
-                    configure :email do
-                        visible false
-                    end
-                    exclude_fields :lock_version
-                    field :authentication_token
-                    # include UserRailsAdminListConcern
+                field :lock_version, :hidden do
+                    visible true
                 end
-                show do
-                    #exclude_fields :id
-                    exclude_fields :lock_version
+                # include UserRailsAdminCreateConcern
+            end
+            edit do
+                field :password do
+                    required false
                 end
-                create do
-                    field :password do
-                        required true
-                    end
-                    field :password_confirmation do
-                        required true
-                    end
-                    field :lock_version, :hidden do
-                        visible true
-                    end
-                    # include UserRailsAdminCreateConcern
+                field :password_confirmation do
+                    required false
                 end
-                edit do
-                    field :password do
-                        required false
-                    end
-                    field :password_confirmation do
-                        required false
-                    end
-                    
-                    field :lock_version, :hidden do
-                        visible true
-                    end
-                    # include UserRailsAdminEditConcern
+                
+                field :lock_version, :hidden do
+                    visible true
                 end
+                # include UserRailsAdminEditConcern
+                
             end
         end
     end

data/lib/thecore_ui_rails_admin.rb

@@ -7,6 +7,7 @@ require 'rails_admin-i18n'
 require 'safe_yaml'
 require 'rails_admin_toggleable'
 require 'rails_admin_settings'
+require 'rails_admin_selectize'
 require 'concerns/rails_admin_requirements'
 # Abilities
 require 'abilities/thecore_ui_rails_admin'
@@ -15,6 +16,8 @@ require 'jquery-ui-rails'
 require 'bootstrap-sass'
 
 require 'concerns/thecore_ui_rails_admin_user'
+require 'concerns/thecore_ui_rails_admin_role'
+require 'concerns/thecore_ui_rails_admin_permission'
 require 'concerns/thecore_rails_admin_export_concern'
 require 'concerns/thecore_rails_admin_bulk_delete_concern'
 

data/lib/thecore_ui_rails_admin/engine.rb

@@ -1,8 +1,5 @@
 module ThecoreUiRailsAdmin
   class Engine < ::Rails::Engine
-    initializer :assets do |config|
-      Rails.application.config.assets.paths << root.join("app", "assets", "stylesheets", "thecore_ui_rails_admin")
-    end
     initializer 'thecore_ui_rails_admin.add_to_migrations' do |app|
       unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM

data/lib/thecore_ui_rails_admin/version.rb

@@ -1,3 +1,3 @@
 module ThecoreUiRailsAdmin
-  VERSION = '2.1.8'
+  VERSION = '2.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ui_rails_admin
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_ui_commons
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rails_admin_selectize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +225,7 @@ files:
 - config/locales/it.main.yml
 - config/locales/it.rails_admin.yml
 - config/locales/it.rollincode.yml
+- config/locales/thecore_settings.en.yml
 - config/locales/thecore_settings.it.yml
 - config/routes.rb
 - db/migrate/20161227101954_create_rails_admin_settings.rb
@@ -219,6 +234,8 @@ files:
 - lib/concerns/rails_admin_requirements.rb
 - lib/concerns/thecore_rails_admin_bulk_delete_concern.rb
 - lib/concerns/thecore_rails_admin_export_concern.rb
+- lib/concerns/thecore_ui_rails_admin_permission.rb
+- lib/concerns/thecore_ui_rails_admin_role.rb
 - lib/concerns/thecore_ui_rails_admin_user.rb
 - lib/tasks/thecore_ui_rails_admin_tasks.rake
 - lib/thecore_ui_rails_admin.rb