From fa43924330b4aab00015afe461f3147dd69fa8b7 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 1 Aug 2016 13:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=A1=B9=E7=9B=AE=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/project.rb                                 |  2 +-
 .../wechat/controllers/edit_class_member.js           | 11 ++++-------
 .../wechat/controllers/edit_project_member.js         | 11 ++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 7085cf377..86f670f33 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -934,7 +934,7 @@ class Project < ActiveRecord::Base
       response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
       logger.debug "response = #{response}"
       self.qrcode = response['ticket']
-      save! && reload
+      save!
       ticket = qrcode
     end
     ticket
diff --git a/public/javascripts/wechat/controllers/edit_class_member.js b/public/javascripts/wechat/controllers/edit_class_member.js
index cddc183c5..2a9987290 100644
--- a/public/javascripts/wechat/controllers/edit_class_member.js
+++ b/public/javascripts/wechat/controllers/edit_class_member.js
@@ -30,13 +30,10 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
     console.log(vm.current_edit_member);
 
     vm.cancel = function(){
-        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
-//            rms.save("project_master_members",[]);
-//            rms.save("project_develop_members",[]);
-//            rms.save("project_report_members",[]);
-            window.history.back();
-//                $location.path("/project").search({id: project_id});
-        });
+//        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            window.history.back();
+//        });
+        window.history.back();
     };
 
     vm.edit_member_role = function(){
diff --git a/public/javascripts/wechat/controllers/edit_project_member.js b/public/javascripts/wechat/controllers/edit_project_member.js
index 1063c0b13..cae768080 100644
--- a/public/javascripts/wechat/controllers/edit_project_member.js
+++ b/public/javascripts/wechat/controllers/edit_project_member.js
@@ -31,13 +31,10 @@ app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'confi
     console.log(vm.current_edit_member);
 
     vm.cancel = function(){
-        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
-//            rms.save("project_master_members",[]);
-//            rms.save("project_develop_members",[]);
-//            rms.save("project_report_members",[]);
-            window.history.back();
-//                $location.path("/project").search({id: project_id});
-        });
+//        vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+//            window.history.back();
+//        });
+        window.history.back();
     };
 
     vm.edit_member_role = function(){