trusty-cms 3.8.4 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16008084828e31ad0ae76709269a435f9a89241d5a8a1e59cde3a310088ec616
-  data.tar.gz: c6c8ec48f78cde6e481e4aede127233895be9d83c9365467022e3fddaa3189f8
+  metadata.gz: 9df33a1248b60c4b20687e3a7922084d20ff5bb27823e040739a6fc0cc10b1ab
+  data.tar.gz: 4afde72f6c24c038665594136612fbe3fc942f307d63d486103e275abae04877
 SHA512:
-  metadata.gz: f994ecbba09fbecd02765367dc379222345d06eaa337707de0f475ddd05708e10f3fc6854755fda963c9937df36a2dffc16f7b4fabb1edfa5e8b4a2d6fbcd6f7
-  data.tar.gz: a4031c894cbfebf29206cdcaf9a0b24aeb03adf8bc4a9f16293b56b1a8a8d2619a96fd4763ac141984863213adf3a54d720fee46c1ba3cc5d308c982d3fc2a6d
+  metadata.gz: e79f689270fcf27d9b55b140ecdce36b7c3e9fe9eff548d14c5e01598b8659cae3fd4157cb7896aed63841863a10966555e73a0f323afb9e6fb259fb4ad8474b
+  data.tar.gz: f84610156d6e501b8549cccf7c6efd1823f0807d5b40dae8e22541126f8176657676ea435ed25879a6207fa3880a893587234636f5c17418cc32a60584fab626

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.8.4)
+    trusty-cms (3.9.0)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)

data/app/assets/javascripts/admin/validations/user_validations.js

@@ -10,7 +10,7 @@ $(function () {
       },
       "user[password]": {
         required: true,
-        minlength: 5
+        minlength: 12
       },
       "user[password_confirmation]": {
         required: true,

data/app/controllers/admin/users_controller.rb

@@ -11,6 +11,17 @@ class Admin::UsersController < Admin::ResourceController
     redirect_to edit_admin_user_path(params[:id])
   end
 
+  def create
+    user = User.new(user_params)
+    if user.save
+      flash[:notice] = 'User was created.'
+      redirect_to admin_users_path
+    else
+      flash[:error] = 'There was an error saving the user. Please try again.'
+      render :new
+    end
+  end 
+
   def update
     user_params = params[model_symbol].permit!
     if user_params && user_params['admin'] == false && model == current_user
@@ -18,8 +29,12 @@ class Admin::UsersController < Admin::ResourceController
       announce_cannot_remove_self_from_admin_role
     end
     model.skip_password_validation = true unless user_params[:password_confirmation].present?
-    model.update_attributes!(user_params)
-    response_for :update
+    if model.update_attributes(user_params)
+      response_for :update
+    else
+      flash[:error] = 'There was an error saving the user. Please try again.'
+      render :edit
+    end    
   end
 
   def ensure_deletable
@@ -31,6 +46,11 @@ class Admin::UsersController < Admin::ResourceController
 
   private
 
+    def user_params
+      params.require(:user).permit(:first_name, :last_name, :admin, :designer, 
+        :password, :password_confirmation, :email, :site_id, :notes)
+    end
+
     def announce_cannot_delete_self
       flash[:error] = t('users_controller.cannot_delete_self')
     end

data/app/models/user.rb

@@ -58,9 +58,7 @@ class User < ActiveRecord::Base
   end
 
   def password_complexity
-    # Regexp extracted from https://stackoverflow.com/questions/19605150/regex-for-password-must-contain-at-least-eight-characters-at-least-one-number-a
-    return if password.blank? || password =~ /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,70}$/
-
+    return false if password.blank? || password =~ /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,70}$/
     errors.add :password, 'Complexity requirement not met. Length should be 12 characters and include: 1 uppercase, 1 lowercase, 1 digit and 1 special character.'
   end
 

data/app/views/admin/configuration/show.html.haml

@@ -5,7 +5,7 @@
     - user.preferences do
       %h3
         .actions
-          = button_to t("edit_preferences"), edit_user_registration_path, :method => :get
+          = button_to t("edit_preferences"), edit_admin_user_path(current_user), :method => :get
         = t('personal_preferences')
       = image_tag(gravatar_url(@user.email, :size=>"64px"), :class=>"avatar", :width=>64, :height=>64, :alt=>"")
       %p.ruled

data/app/views/admin/users/_choose_site.html.haml

@@ -1,4 +1,4 @@
-- unless current_user.site
+- if current_user.admin?
   %tr
     %th.label
       %label{:for=>"user_admin"} Can edit site

data/app/views/admin/users/_form.html.haml

@@ -23,12 +23,13 @@
       = render "password_fields", :f => f
 
     - form.edit_roles do
-      %p
-        %label.multi_option= t('roles')
-        = f.check_box "admin", :class => "checkbox"
-        = f.label :admin, t('admin'), :class => "checkbox"
-        = f.check_box "designer", :class => "checkbox"
-        = f.label :designer, t('designer'), :class => "checkbox"
+      - if current_user.admin?
+        %p
+          %label.multi_option= t('roles')
+          = f.check_box "admin", :class => "checkbox"
+          = f.label :admin, t('admin'), :class => "checkbox"
+          = f.check_box "designer", :class => "checkbox"
+          = f.label :designer, t('designer'), :class => "checkbox"
 
     - form.edit_notes do
       %p

data/app/views/admin/users/_password_fields.html.haml

@@ -6,10 +6,10 @@
 .set#change_password{:style=> (!@user.new_record? && @user.valid?) ? "display: none" : nil}
   %p
     = f.label :password, t('new_password')
-    = f.password_field "password", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'off'
+    = f.password_field "password", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'new-password'
   %p
     = f.label :password_confirmation, t('password_confirmation')
-    = f.password_field "password_confirmation", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'off'
+    = f.password_field "password_confirmation", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'new-password'
     - unless @user.new_record?
       %span
         = t('or')

data/app/views/admin/users/index.html.haml

@@ -25,14 +25,15 @@
               %td.roles= roles(user)
             - tbody.actions_cell do
               %td.actions
-                - if user == current_user
+                - if !current_user.admin?
                   %span.action.disabled= image('minus_disabled') + ' ' + t('remove')
                 - else
                   = link_to image('minus') + ' ' + t('remove'), remove_admin_user_url(user), :class => "action"
 
 - render_region :bottom do |bottom|
   - bottom.new_button do
-    #actions
-      = pagination_for(@users)
-      %ul
-        %li= link_to image('plus') + " " + t('new_user'), new_admin_user_url, :class => 'action_button'
+    - if current_user.admin?
+      #actions
+        = pagination_for(@users)
+        %ul
+          %li= link_to image('plus') + " " + t('new_user'), new_admin_user_url, :class => 'action_button'

data/config/initializers/devise.rb

@@ -177,7 +177,7 @@ Devise.setup do |config|
 
   # ==> Configuration for :validatable
   # Range for password length.
-  config.password_length = 12..128
+  config.password_length = 12..64
 
   # Email regex used to validate email formats. It simply asserts that
   # one (and only one) @ exists in the given string. This is mainly
@@ -227,7 +227,7 @@ Devise.setup do |config|
 
   # When set to false, does not sign a user in automatically after their password is
   # reset. Defaults to true, so a user is signed in automatically after a reset.
-  # config.sign_in_after_reset_password = true
+  config.sign_in_after_reset_password = false
 
   # ==> Configuration for :encryptable
   # Allow you to use another hashing or encryption algorithm besides bcrypt (default).

data/config/routes.rb

@@ -1,6 +1,6 @@
 TrustyCms::Application.routes.draw do
   root to: 'site#show_page'
-  devise_for :users, module: :devise
+  devise_for :users, module: :devise, :skip => :registration
   get '/rad_social/mail' => 'social_mailer#social_mail_form', as: :rad_social_mail_form
   post '/rad_social/mail' => 'social_mailer#create_social_mail', as: :rad_create_social_mail
   TrustyCms::Application.config.enabled_extensions.each { |ext|

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.8.4'
+    VERSION = '3.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.8.4
+  version: 3.9.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -589,7 +589,6 @@ files:
 - app/assets/javascripts/admin/validations/user_validations.js
 - app/assets/javascripts/ckeditor/config.js
 - app/assets/javascripts/ckeditor/contents.css
-- app/assets/javascripts/notes.md
 - app/assets/javascripts/rad_social/captcha.js
 - app/assets/javascripts/rad_social/jquery.validate.min.js
 - app/assets/javascripts/rad_social/rad_ajax_form.js

data/app/assets/javascripts/notes.md

@@ -1,39 +0,0 @@
-Removed Features
-===============
-
-* Fade in/fade out on drag/drop
-* Transparency while dragging
-* Dropdown slide down/up
-* Ability to drag/drop popups
-* Shortcut keys
-  * s to save
-  * [ and ] to move between tabs
-  * 1-9 to select tabs by number
-* Support for tabs in textareas
-* Tag search in available tags reference
-* Pretty popups
-* form activate - focus fields
-
-TODO
-====
-
-* Page field addition/removal, make pagefield.js more like page-edit.js
-* Published at field datepicker
-* Validation errors that are in context and can be dismissed
-* (ajax spinner) Onsubmit statuses
-
-* When page status is set to Scheduled, Published, or Hidden (>=90), show the published_at field. Otherwise, hide the published_at field.
-* Get page_edit_javascripts and layout_edit_javascripts out of ruby
-* Reimplement any undefined utility function calls
-* (docs) Load tag reference - "Available Tags" link
-
-Might work
-==========
-
-* pagefield.js
-* Cookie
-
-Notes
-=====
-
-* Sitemap only looks to be used on the table on the remove page, but it doesn't seem to have any effect. It looks like you used to be able to toggle things expanded or collapsed.