artfully_ose 1.2.0.pre.2 → 1.2.0.pre.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE5ZDIwNmY1N2ZhMjdiYjc1MmQ0YjJjNjdjNGY5Yjc4MjRkNGVkZA==
+    NDQ5MzdhZmU4MmM3OTExYjViMGExNTY2OWU4ZTcxMWEyM2U5YTQxNQ==
   data.tar.gz: !binary |-
-    ZWNlMDQ4N2VkN2IzM2U2ZDFiOTZhNGZhNTNlYjJkNGY0MTc1ZGI5MA==
+    MTNiYWI5ZThiMTQwOTViODA4NmQ0NmM1M2Q4NTBlMTg5NTFjZDk4OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2EyMjJhZmRiN2MzNGQwMzlmNjI3ODliOTNkZmZlMzc0N2RiZmYyMzFhNWEx
-    NzI0NWEyNjk1NjE5M2Y3YmVmYjA3YTFiMDg0NjJiOTY5MWZjZGU4OTJmOGFj
-    MjhiOTA2ZmQ3MTc1N2Y4NzFhOTAwNWJmN2UxZDg2NzFjYmQ4NTA=
+    YzdmMjM4NDgwNWRlMTI1MGY4YzM3YjFjNzNhMGY2MjIzOGI1NjU5MWZmMjQy
+    ZDgyZDc4ZTI0ZTVjODY1ZGY2NDc0NzYyYzliYzUyNTZlY2Q2MGY1N2YxOWU3
+    MjIyODcyZWZiYmFkOGFlZWU0MmZlN2QxMDkzNTg3ZDlkOGQ3OWI=
   data.tar.gz: !binary |-
-    ZjZiOTI5MjRlOGEyZDUwYmMzZDc0NDU0NGFiMjk3ZGI1YjQ4NWZjYjY5MDNk
-    NGViOTczNGMxZGY3MzMwMmNmODNmNGVkZWJjZTJmMDk0NjkzNmQxNzM4MWZh
-    MmExOTFhZTJkZmU4NDM1NjFmMjQyMzJjNmIxZDAyNjExZTYxMjE=
+    NmUwOWE4ZmE2OWEzZjhhZTI1N2NkZWJlMzZmOGQyMGNhZTE0NzY4Njk3Mzgw
+    Mjk3YzFmZTczMmM2NjBjMmMyNDY3ZTgyNGNlMzA0ZDBiMjhkNWY5OWE0YmM0
+    OWIyNDdlZjZlYzE5ZDE4ZjE5ZGJhZmM5YjBmYjU2ZTQ3ZTJjMjI=

data/app/models/member.rb

@@ -12,6 +12,19 @@ class Member < ActiveRecord::Base
 
   before_create :set_member_number
 
+  #
+  # devise_invitable needs this otherwise it can't set the :from param in an email
+  #
+  def headers_for(action)
+    case action.to_s
+    when "invitation_instructions"
+      puts "aye"
+      {:from => self.organization.email}
+    else
+      {}
+    end
+  end
+
   def self.generate_password
     Devise.friendly_token
   end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.2"
+  VERSION = "1.2.0.pre.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.2
+  version: 1.2.0.pre.3
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails