tramway-user 2.1.3 → 2.1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c93a4759c90b60858ccb08d74a67a255627d082b918c5bd2a0c820330559109
-  data.tar.gz: 1a955a0de07469bb8fe519e5f0c89bc2340f3998f789f0e63fc66f236d3da3c4
+  metadata.gz: 139cc090b24cda759d1b6cee9ab6be2b8df9e02f6ab998b1106e26d90e5fec4e
+  data.tar.gz: a093cbd6a01e0003796ff8164acfb71461fe26347faa4e627425febe8824ae4f
 SHA512:
-  metadata.gz: 1f34a1205dc744cc9a52b9ff0f70c2cffb1ba0d61d7b83c59258e408729f35b00b907bebd566b1d8680cc9dea05d81bad6ea29c21a00896bb3462c74fc7bde94
-  data.tar.gz: 1f577c0f97c2930fd46df20065dcc88f01e6d2add0523313905312019adfaaff37eada73e6cbd56327e262216f6f7bcff8398a91caa26642a959a21704b3d15e
+  metadata.gz: b1876918bf785a6f8b58bfc73aa7a94420a2de13b78d0a38a6cafaa0919a257ca36612fb7f96c21576b732a59f4860f62d3cd8bcdffef24a8ae24eea79886510
+  data.tar.gz: 27a3c4e4ac46c5aa2ca338434904e11c3381e6698fb78f7d894fa99c7917e0925394e1ff984d9760259928d4331eb570063d99ba8cf2338b2eae569ee29b3858

data/README.md

@@ -26,6 +26,10 @@ $ gem install tramway-user
 
 `Tramway::User::User` has scope `admins` which returns all admins from the app.
 
+## Instructions
+
+Edit roles for `Tramway::User::User` model - [doc](https://github.com/ulmic/tramway-dev/tree/develop/tramway#if-you-want-to-edit-roles-to-the-tramwayuseruser-class)
+
 ## Contributing
 Contribution directions go here.
 

data/app/decorators/tramway/user/user_decorator.rb

@@ -16,16 +16,16 @@ class Tramway::User::UserDecorator < ::Tramway::Core::ApplicationDecorator
 
     if defined? Tramway::Conference
       def show_associations
-        [ :social_networks ]
+        [:social_networks]
       end
     end
   end
 
   decorate_association :social_networks, as: :record if defined? Tramway::Conference
 
-  delegate_attributes :first_name, :last_name, :email, :phone, :role, :created_at, :updated_at
+  delegate_attributes :first_name, :last_name, :email, :phone, :role, :created_at, :updated_at, :admin?
 
   def name
-    "#{object.first_name} #{object.last_name}"
+    "#{object&.first_name} #{object&.last_name}"
   end
 end

data/app/forms/admin/tramway/user/user_form.rb

@@ -5,7 +5,8 @@ class Admin::Tramway::User::UserForm < ::Tramway::Core::ApplicationForm
 
   properties :email, :password, :first_name, :last_name, :role, :phone
 
-  validates :email, email: true
+  # fix me
+  validates :email, email: true, uniqueness: true, on: :destroy unless model_class.columns_hash['project_id'].present?
 
   def initialize(object)
     super(object).tap do

data/app/models/tramway/user/user.rb

@@ -2,7 +2,7 @@
 
 class Tramway::User::User < ::Tramway::Core::ApplicationRecord
   has_secure_password
-  
+
   has_many :social_networks, as: :record, class_name: 'Tramway::Profiles::SocialNetwork' if defined? Tramway::Conference
 
   # FIXME: replace to tramway-admin

data/lib/tramway/user/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module User
-    VERSION = '2.1.3'
+    VERSION = '2.1.3.4'
   end
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: tramway-user
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.3.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.11
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.11
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.11
 - !ruby/object:Gem::Dependency
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Engine for users in your Rails app