From d4f8bd29f418c80c339bcef7384c36bbd943f0f7 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 1 Sep 2016 11:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/apis/courses.rb | 2 +- app/api/mobile/apis/projects.rb | 2 +- app/api/mobile/entities/project.rb | 1 + app/services/courses_service.rb | 1 - app/services/projects_service.rb | 2 +- public/assets/wechat/class.html | 4 ++-- public/javascripts/wechat/controllers/class.js | 5 +++++ public/javascripts/wechat/controllers/join_class.js | 5 ++++- public/javascripts/wechat/controllers/join_project.js | 5 ++++- public/javascripts/wechat/controllers/project.js | 11 +++++++++++ 10 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb index c8b67448e..b5af07a09 100644 --- a/app/api/mobile/apis/courses.rb +++ b/app/api/mobile/apis/courses.rb @@ -685,7 +685,7 @@ module Mobile roles_ids << role.id end - if my_member && roles_ids.include?(3) + if my_member && (roles_ids.include?(3) || roles_ids.include?(7) || roles_ids.include?(9) ) #删除该成员 cs = CoursesService.new status = cs.delete_course_member(c,params[:user_id].to_i,current_user) diff --git a/app/api/mobile/apis/projects.rb b/app/api/mobile/apis/projects.rb index 665d068ae..ecd850fd8 100644 --- a/app/api/mobile/apis/projects.rb +++ b/app/api/mobile/apis/projects.rb @@ -336,7 +336,7 @@ module Mobile out = {status: status} message = case status when 0; "退出项目成功" - when -3; "您不在项目中" + when -3; "您不是该项目成员" when -1; "您还未登录" when -2; "项目创建者不能退出项目" else; "未知错误，请稍后再试" diff --git a/app/api/mobile/entities/project.rb b/app/api/mobile/entities/project.rb index 8da151b42..eef7a9c92 100644 --- a/app/api/mobile/entities/project.rb +++ b/app/api/mobile/entities/project.rb @@ -3,6 +3,7 @@ module Mobile class Project < Grape::Entity expose :name expose :id + expose :is_public expose :user_id expose :invite_code expose :qrcode diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index f23b59dcb..f184fa923 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -1295,7 +1295,6 @@ class CoursesService member = course.members.where("user_id=?",user_id).first if member != nil - member.destroy user_admin = CourseInfos.where("user_id = ? and course_id = ?", member.user_id, course.id) if user_admin.size > 0 diff --git a/app/services/projects_service.rb b/app/services/projects_service.rb index ea2350495..f3679aa22 100644 --- a/app/services/projects_service.rb +++ b/app/services/projects_service.rb @@ -404,7 +404,7 @@ class ProjectsService end members = Member.where(:user_id => user.id, :project_id=>project.id).first - if members != nil && members.roles.first.to_s != "Manager" + if members != nil members.destroy # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除 applied_projects = AppliedProject.where(:project_id => project.id, :user_id => members.user_id).first diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html index 706cf5206..f81b4f5f0 100644 --- a/public/assets/wechat/class.html +++ b/public/assets/wechat/class.html @@ -239,7 +239,7 @@
{{teacher.name}} - + 管理员 助教
@@ -255,7 +255,7 @@
我的同学
{{student.name}} - +
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js index fdd5bcd71..2e3ab4b22 100644 --- a/public/javascripts/wechat/controllers/class.js +++ b/public/javascripts/wechat/controllers/class.js @@ -340,6 +340,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location if(response.data.status == 0){ vm.alertService.showMessage('提示', response.data.message,function(){ //确定 + rms.save('course_activities_page',0); + rms.save("course_activities",[]); + rms.save("course_has_more",false); + rms.save("course",null); + rms.save("tab_num",null); rms.save('syllabuses',[]); $location.path("/class_list"); }); diff --git a/public/javascripts/wechat/controllers/join_class.js b/public/javascripts/wechat/controllers/join_class.js index 1a9710bc1..006fa0b59 100644 --- a/public/javascripts/wechat/controllers/join_class.js +++ b/public/javascripts/wechat/controllers/join_class.js @@ -21,7 +21,9 @@ app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'ale // window.history.back(); // }); if(tag){ - window.history.back(); + rms.save('syllabuses',[]); + $location.path("/class_list"); +// window.history.back(); } else{ wx.closeWindow(); @@ -55,6 +57,7 @@ app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'ale }).then(function(response){ if(response.data.status == 0){ vm.alertService.showMessage('提示', response.data.message,function(){ + rms.save('syllabuses',[]); $location.path("/class_list"); }); } else { diff --git a/public/javascripts/wechat/controllers/join_project.js b/public/javascripts/wechat/controllers/join_project.js index d942e8859..2e8f9a269 100644 --- a/public/javascripts/wechat/controllers/join_project.js +++ b/public/javascripts/wechat/controllers/join_project.js @@ -15,7 +15,9 @@ app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'a vm.cancel = function(){ if(tag){ - window.history.back(); +// window.history.back(); + rms.save('projects',[]); + $location.path("/project_list"); } else{ wx.closeWindow(); @@ -47,6 +49,7 @@ app.controller('JoinProjectController', ['$scope', '$http', 'auth', 'config', 'a }).then(function(response){ if(response.data.status == 0){ vm.alertService.showMessage('提示', response.data.message,function(){ + rms.save('projects',[]); $location.path("/project_list"); }); } else { diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js index 3f90917b4..1bdb2f1e0 100644 --- a/public/javascripts/wechat/controllers/project.js +++ b/public/javascripts/wechat/controllers/project.js @@ -266,6 +266,17 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut if(response.data.status == 0){ vm.alertService.showMessage('提示', response.data.message,function(){ //确定 + rms.save('project_activities_page',0); + rms.save("project_activities",[]); + rms.save("project_has_more",false); + rms.save("project",null); + rms.save("project_master_members",[]); + rms.save("project_develop_members",[]); + rms.save("project_report_members",[]); + rms.save("review_master_members",[]); + rms.save("review_develop_members",[]); + + rms.save('tab_num',null); rms.save('projects',[]); $location.path("/project_list"); });