usman 0.4.0.pre.materialize → 0.4.1.pre.materialize

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249944b38740618e19948df32b3b5efb35c4d3c5bc40df91cd17f06804fc6b90
-  data.tar.gz: 9f14a4c2d4903e35072317db1bf5a687f217ac39a645b22a01dcfd700fb7cce3
+  metadata.gz: '01738b467cef0b1a62c4a02c0340955020aef2e7ea3a5be0fddc8d086eab16fa'
+  data.tar.gz: bacd00ee623cd2bcb03c96a4a85efde6dc0eb7ec8f4feb4023858984d53f58c7
 SHA512:
-  metadata.gz: ed66807d187066a743ec189bc900ebb3861275e1e7bdcb0849ebd997f4e6f61aae77b4200cbcedd061daa0ef8ca51b8aab243789108f341423c2fb1402ba10ef
-  data.tar.gz: d2a1487af1403b6212739e49a9baf9b771582fdd4e7f3214de4784808f89499ad18ad26ff4e57b3f24170571284eee58d785e99732219c30a9dbcbaa2abd37b0
+  metadata.gz: 628102828b6f5050241df26ee76c8a958242eb727cd540282cb9333e8532b5da5c26c062d3f7aca1fc1687642c0f566bb03238e0e99805cbbb8da4a5fb8f23fa
+  data.tar.gz: 8f55d8fd594ab5af9bd566d38c253372a9927c818c2c34399040a324f7f76ea0dc9588cad39c7605fd2fcf0f4b2db2a5f30be1b17d6ee6e59b73c443935a9048

data/app/controllers/usman/users_controller.rb

@@ -12,6 +12,8 @@ module Usman
         @user.approve!
       when "suspended"
         @user.suspend!
+      when "deleted"
+        @user.delete!
       end
       set_notification(true, I18n.t('status.success'), I18n.t('state.changed', item: default_item_name.titleize, new_state: @r_object.status))
       render_row

data/app/helpers/usman/authentication_helper.rb

@@ -15,7 +15,10 @@ module Usman
     end
 
     def permission_denied
-      render :file => "layouts/kuppayam/xenon/401", layout: 'layouts/kuppayam/xenon/blank_with_nav', :status => :unauthorized
+      file_path = "layouts/kuppayam/#{@current_layout}/401"
+      layout_path = "layouts/kuppayam/#{@current_layout}/blank_with_nav"
+
+      render :file => file_path, layout: layout_path, :status => :unauthorized
     end
     
     # Returns the default URL to which the system should redirect the user after successful authentication

data/app/models/user.rb

@@ -102,6 +102,7 @@ class User < Usman::ApplicationRecord
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
 
+  scope :pending_or_approved, -> { where(status: [PENDING, APPROVED]) }
   scope :pending, -> { where(status: PENDING) }
   scope :approved, -> { where(status: APPROVED) }
   scope :suspended, -> { where(status: SUSPENDED) }
@@ -120,17 +121,17 @@ class User < Usman::ApplicationRecord
 
     return if hsh[:name].blank?
 
-    user = User.find_by_username(hsh[:username]) || User.new
-    user.name = hsh[:name]
-    user.username = hsh[:username]
-    user.designation_name = hsh[:designation_name]
-    user.organisation_name = hsh[:organisation_name]
-    user.email = hsh[:email]
-    user.phone = hsh[:phone]
+    user = User.find_by_username(hsh[:username].to_s.strip) || User.new
+    user.name = hsh[:name].to_s.strip
+    user.username = hsh[:username].to_s.strip
+    user.designation_name = hsh[:designation_name].to_s.strip
+    user.organisation_name = hsh[:organisation_name].to_s.strip
+    user.email = hsh[:email].to_s.strip
+    user.phone = hsh[:phone].to_s.strip
 
     user.super_admin = ["true", "t","1","yes","y"].include?(hsh[:super_admin].to_s.downcase.strip)
+    user.status = hsh[:status].to_s.strip == "" ? APPROVED : hsh[:status].to_s.strip
 
-    user.status = hsh[:status]
     user.assign_default_password
 
     # Initializing error hash for displaying all errors altogether
@@ -214,11 +215,11 @@ class User < Usman::ApplicationRecord
             end
 
           else
-            puts "Unsupported File encountered'#{path.to_s}'.".red if verbose
+            puts "Unsupported File encountered'#{csv_path.to_s}'.".red if verbose
             return
           end
         else
-          puts "Import File not found at '#{path.to_s}'.".red if verbose
+          puts "Import File not found at '#{csv_path.to_s}'.".red if verbose
         end
       end
     end
@@ -413,7 +414,7 @@ class User < Usman::ApplicationRecord
   end
 
   def can_be_marked_as_pending?
-    approved? or suspended?
+    approved? or suspended? or deleted?
   end
 
   def can_be_suspended?
@@ -421,7 +422,7 @@ class User < Usman::ApplicationRecord
   end
 
   def can_be_deleted?
-    suspended?
+    suspended? or pending?
   end
 
   def can_be_edited?
@@ -554,6 +555,14 @@ class User < Usman::ApplicationRecord
     self.dummy = true
   end
 
+  def display_last_signed_in
+    if self.current_sign_in_at
+      self.current_sign_in_at.strftime("%b %d %Y - %H:%M:%S")
+    elsif self.last_sign_in_at
+      self.last_sign_in_at.strftime("%b %d %Y - %H:%M:%S")
+    end
+  end
+
   # Image Configuration
   # -------------------
   def image_configuration

data/lib/tasks/usman/data.rake

@@ -109,7 +109,7 @@ namespace 'usman' do
           destroy_all = false
           destroy_all = true if ["true", "t","1","yes","y"].include?(ENV["destroy_all"].to_s.downcase.strip)
           
-          path = Rails.root.join('db', 'data', "users_roles.csv")
+          path = Rails.root.join('db', 'data', 'dummy', "users_roles.csv")
           path = Usman::Engine.root.join('db', 'data', 'dummy', "users_roles.csv") unless File.exists?(path)
           
           # FIXME - Don't know how to clean up a HABTM intermediate table contents

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.4.0-materialize'
+  VERSION = '0.4.1.pre.materialize'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.materialize
+  version: 0.4.1.pre.materialize
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,42 +102,30 @@ dependencies:
   name: kuppayam
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.2.1.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.2.1.pre.materialize
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 0.2.1.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.25
+        version: 0.2.1.pre.materialize
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement