Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/applied_project_controller.rb

@@ -61,7 +61,7 @@ class AppliedProjectController < ApplicationController
       @flag = 3
     else
       @flag = 4
-      role = params[:member] == "member_manager" ? 3 : (params[:member] = "member_developer" ? 4 :5)
+      role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)
       applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role)
       # 申请成功则给项目管理员发送邮件及发送消息
       Mailer.run.applied_project(applied_project)

app/controllers/projects_controller.rb

@@ -792,6 +792,11 @@ class ProjectsController < ApplicationController
       members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first
       if  members != nil && members.roles.first.to_s != "Manager"
         members.destroy
+        # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除
+        applied_projects = AppliedProject.where(:project_id => @project.id, :user_id => members.user_id).first
+        unless applied_projects.nil?
+          applied_projects.delete
+        end
       end
       respond_to do |format|
         format.js

app/views/applied_project/_applied_join_project.html.erb

@@ -19,8 +19,8 @@
           <div class="cl"></div>
         </li>
         <li>
-          <label>&nbsp;</label>
+          <label class="mr27">&nbsp;</label>
-          <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#project_applied_form').submit();hideModal()">确&nbsp;&nbsp;定</a></div>
+          <a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#project_applied_form').submit();hideModal()">确&nbsp;&nbsp;定</a>
           <a href="javascript:void(0);" class="sy_btn_grey fl ml20" onclick="hideModal()">取&nbsp;&nbsp;消</a>
           <div class="cl"></div>
         </li>

app/views/users/_courses_list.html.erb

@@ -13,7 +13,7 @@
               </div>
               <div class="">
                 <p class="fl grayTxt ">更新：<%=format_date Time.at(course.updatetime) %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
-                <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
+                <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
                 <div class="cl"></div>
               </div>
             </div>

app/views/users/_user_message_applide_action.html.erb

@@ -1,5 +1,5 @@
 <% if allow_to_show(ma) %>
-    ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
+    <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
     <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
 <% elsif ma.status == 4 %>
     <span class="fontGrey3">被拒绝</span>