erp_tech_svcs 3.1.3 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -135,7 +135,7 @@ class FileAsset < ActiveRecord::Base
135
135
 
136
136
  # compass file download url
137
137
  def url
138
- "/download/#{self.name}?#{self.directory}"
138
+ "/download/#{self.name}?path=#{self.directory}"
139
139
  end
140
140
 
141
141
  # returns full path to local image or url to s3 image
data/app/models/user.rb CHANGED
@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
2
2
  include ErpTechSvcs::Utils::CompassAccessNegotiator
3
3
  include ActiveModel::Validations
4
4
 
5
- attr_accessor :password_validator
5
+ attr_accessor :password_validator, :skip_activation_email
6
6
 
7
7
  belongs_to :party
8
8
 
@@ -28,6 +28,11 @@ class User < ActiveRecord::Base
28
28
  end
29
29
  end
30
30
 
31
+ # This allows the disabling of the activation email sent via the sorcery user_activation submodule
32
+ def send_activation_needed_email!
33
+ super unless skip_activation_email
34
+ end
35
+
31
36
  #these two methods allow us to assign instance level attributes that are not persisted. These are used for mailers
32
37
  def instance_attributes
33
38
  @instance_attrs.nil? ? {} : @instance_attrs
@@ -4,8 +4,6 @@ module ErpTechSvcs
4
4
 
5
5
  isolate_namespace ErpTechSvcs
6
6
 
7
- Mime::Type.register "application/pdf", :pdf
8
-
9
7
  ActiveSupport.on_load(:active_record) do
10
8
  include ErpTechSvcs::Extensions::ActiveRecord::HasSecurityRoles
11
9
  include ErpTechSvcs::Extensions::ActiveRecord::HasFileAssets
@@ -2,7 +2,7 @@ module ErpTechSvcs
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 3
4
4
  MINOR = 1
5
- TINY = 3
5
+ TINY = 4
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: erp_tech_svcs
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.3
4
+ version: 3.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-22 00:00:00.000000000 Z
12
+ date: 2013-06-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: erp_base_erp_svcs