erp_tech_svcs 3.1.3 → 3.1.4

data/app/models/file_asset.rb

@@ -135,7 +135,7 @@ class FileAsset < ActiveRecord::Base
 
   # compass file download url
   def url
-    "/download/#{self.name}?#{self.directory}"
+    "/download/#{self.name}?path=#{self.directory}"
   end
 
   # returns full path to local image or url to s3 image

data/app/models/user.rb

@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
   include ErpTechSvcs::Utils::CompassAccessNegotiator
   include ActiveModel::Validations
 
-  attr_accessor :password_validator
+  attr_accessor :password_validator, :skip_activation_email
 
   belongs_to :party
 
@@ -28,6 +28,11 @@ class User < ActiveRecord::Base
     end
   end
 
+  # This allows the disabling of the activation email sent via the sorcery user_activation submodule
+  def send_activation_needed_email!
+    super unless skip_activation_email
+  end
+
   #these two methods allow us to assign instance level attributes that are not persisted.  These are used for mailers
   def instance_attributes
     @instance_attrs.nil? ? {} : @instance_attrs

data/lib/erp_tech_svcs/engine.rb

@@ -4,8 +4,6 @@ module ErpTechSvcs
 
     isolate_namespace ErpTechSvcs
 
-    Mime::Type.register "application/pdf", :pdf
-
 	  ActiveSupport.on_load(:active_record) do
       include ErpTechSvcs::Extensions::ActiveRecord::HasSecurityRoles
       include ErpTechSvcs::Extensions::ActiveRecord::HasFileAssets

data/lib/erp_tech_svcs/version.rb

@@ -2,7 +2,7 @@ module ErpTechSvcs
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_tech_svcs
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_base_erp_svcs