From 222855ea796e9ea30321f18b834775c2ffcd350e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 28 Jun 2016 19:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=8A=E8=BF=87course=E8=A1=A8=E7=9A=84valid?=
 =?UTF-8?q?ate,=E4=BB=A5=E9=98=B2save=20invitecode=20=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile              | 6 +++++-
 app/models/course.rb | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b482cb6fd..eef93c371 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,11 @@ source 'https://ruby.taobao.org/'
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
-  gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  if RUBY_PLATFORM =~ /darwin/
+    gem "rmagick", "= 2.15.4" ## osx must be this version
+  else
+    gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  end
   gem 'certified'
 end
 
diff --git a/app/models/course.rb b/app/models/course.rb
index f286a2443..0c4acce97 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -470,8 +470,7 @@ class Course < ActiveRecord::Base
     if !code || code.size <5
       code = CODES.sample(5).join
       return generate_invite_code if Course.where(invite_code: code).present?
-      self[:invite_code] = code
-      save! && reload
+      update_attribute(:invite_code, code)
     end
     code
   end