班级项目成员管理BUG修改

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)

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; "未知错误，请稍后再试"

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

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

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

public/assets/wechat/class.html

@@ -239,7 +239,7 @@
 
         <div class="class-member-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
             <img ng-src="{{teacher.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{teacher.name}}</span><img ng-src="/images/wechat/{{teacher.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
-            <img src="/images/wechat/setting.png" ng-show = "course.is_creator && teacher.id != course.tea_id" width="15" class="fr mr10" style="margin-top:7px;" ng-click="onSetting(teacher)" />
+            <img src="/images/wechat/setting.png" ng-show = "isTeacher && teacher.id != course.tea_id" width="15" class="fr mr10" style="margin-top:7px;" ng-click="onSetting(teacher)" />
             <span class = "fr mr25 mt5" ng-show ="teacher.id == course.tea_id">管理员</span>
             <span ng-class="['fr','mt5',{'mr10': course.is_creator,'mr25': !course.is_creator}]" ng-show ="teacher.id != course.tea_id && teacher.roles_id == 7">助教</span>
             <div class="cl"></div>
@@ -255,7 +255,7 @@
         <div class="member-banner f13 mt10 c-grey3">我的同学</div>
         <div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
             <img ng-src="{{student.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
-            <img src="/images/wechat/setting.png" ng-show = "course.is_creator" width="15" class="class-list-setting" ng-click="onSetting(student)" />
+            <img src="/images/wechat/setting.png" ng-show = "isTeacher" width="15" class="class-list-setting" ng-click="onSetting(student)" />
             <div class="cl"></div>
         </div>
 

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");
                     });

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 {

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 {

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");
                     });