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

app/controllers/admin_controller.rb

@@ -62,6 +62,7 @@ class AdminController < ApplicationController
       course = Course.where("id = #{params[:course_id].to_i}").first
       unless course.nil?
         course.update_column('syllabus_id', params[:syllabus_id].to_i)
+        Rails.logger.error "update_syllabus_id: admin_controller/select_scourse_syllabus"
         @flag = true
       end
     end
@@ -83,6 +84,7 @@ class AdminController < ApplicationController
         syllabus.description = Message.where("id = 19412").first.nil? ? nil : Message.where("id = 19412").first.content
         if syllabus.save
           course.update_column('syllabus_id', syllabus.id)
+          Rails.logger.error "update_syllabus_id: admin_controller/create_syllabus"
           @flag = params[:flag].to_i
           @course = course
           respond_to do |format|

app/controllers/homework_common_controller.rb

@@ -58,9 +58,10 @@ class HomeworkCommonController < ApplicationController
 
   def edit
     @user = User.current
-    @is_in_course = params[:is_in_course].to_i
+    @is_in_course = params[:is_in_course]
+    @is_manage = params[:is_manage]
     @course_activity = params[:course_activity].to_i
-    if @is_in_course == 1 || @course_activity == 1
+    if @is_in_course.to_i == 1 || @course_activity == 1
       @left_nav_type = 3
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
@@ -144,7 +145,11 @@ class HomeworkCommonController < ApplicationController
         @homework_detail_programing.save if @homework_detail_programing
         @homework_detail_group.save if @homework_detail_group
 
-        if params[:is_in_course] == "1"
+        if params[:is_manage] == "1"
+          redirect_to manage_or_receive_homeworks_user_path(User.current.id)
+        elsif params[:is_manage] == "2"
+          redirect_to my_homeworks_user_path(User.current.id)
+        elsif params[:is_in_course] == "1"
           redirect_to homework_common_index_path(:course => @course.id)
         elsif params[:is_in_course] == "0"
           redirect_to user_homeworks_user_path(User.current.id)

app/controllers/pull_requests_controller.rb

@@ -98,7 +98,7 @@ class PullRequestsController < ApplicationController
   # @return [Gitlab::ObjectifiedHash]
   def accept_pull_request
     begin
-      status = @g.accept_merge_rquest(@project.gpid, params[:id])
+      status = @g.accept_merge_rquest(@project.gpid, params[:id], User.current.gid)
       respond_to do |format|
         format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
       end

app/controllers/student_work_controller.rb

@@ -775,30 +775,33 @@ class StudentWorkController < ApplicationController
   end
 
   def retry_work
-    if @work.destroy
-      if @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 1
-        pros = @work.student_work_projects.where("is_leader = 0")
-        pros.each do |pro|
-          pro.destroy
-        end
-        project = @work.student_work_projects.where("is_leader = 1").first
-        project.update_attributes(:student_work_id => nil)
-      elsif @homework.homework_type == 3 &&  @homework.homework_detail_group.base_on_project == 0
-        @work.student_work_projects.each do |pro2|
-          pro2.destroy
+    if @homework.homework_type == 3
+      if @work.destroy
+        if @homework.homework_detail_group.base_on_project == 1
+          pros = @work.student_work_projects.where("is_leader = 0")
+          pros.each do |pro|
+            pro.destroy
+          end
+          project = @work.student_work_projects.where("is_leader = 1").first
+          project.update_attributes(:student_work_id => nil)
+        elsif @homework.homework_detail_group.base_on_project == 0
+          @work.student_work_projects.each do |pro2|
+            pro2.destroy
+          end
         end
       end
-      @student_work = StudentWork.new
-      respond_to do |format|
-        format.js
-      end
+    elsif @homework.homework_type == 1
+      @work.update_attributes(:work_status => 0, :name => "#{@homework.name}的作品提交", :description => nil, :late_penalty => 0)
+    end
+    @student_work = StudentWork.new
+    respond_to do |format|
+      format.js
     end
   end
 
   #添加评分，已评分则为修改评分
   def add_score
     @is_last = params[:is_last] == "true"
-    render_403 and return if User.current == @work.user #不可以匿评自己的作品
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
     render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2

app/controllers/users_controller.rb

@@ -599,7 +599,7 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #我的题库
       courses = @user.courses.where("is_delete = 1")
       course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #公共题库
       visible_course = Course.where("is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
@@ -1460,6 +1460,7 @@ class UsersController < ApplicationController
   def user_projects4show
     @page = params[:page].to_i + 1
     @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10).offset(@page * 10)
+    @all_count = @user.projects.visible.count
   end
 
   def user_course_activities

app/models/student_work.rb

@@ -1,6 +1,6 @@
 #学生提交作品表
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test, :simi_id, :simi_value
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test, :simi_id, :simi_value, :work_status
 
   belongs_to :homework_common
   belongs_to :user

app/services/courses_service.rb

@@ -353,6 +353,7 @@ class CoursesService
       #@course.password = params[:course][:password]
       @course.tea_id = current_user.id
       @course.syllabus_id = params[:syllabus_id].to_i
+      Rails.logger.error "update_syllabus_id: courses_service/create_course"
       @course.term = params[:term]
       @course.time = params[:time]
       @course.end_term = params[:end_term]
@@ -412,6 +413,7 @@ class CoursesService
     #course.safe_attributes = params[:course]
     #course.password = params[:course][:password]
     course.syllabus_id = params[:syllabus_id].to_i
+    Rails.logger.error "update_syllabus_id: courses_service/edit_course"
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]

app/services/syllabuses_service.rb

@@ -86,12 +86,14 @@ class SyllabusesService
       courses.each do |course|
         if ::Course === course
           course.syllabus_id = sy.id
+          Rails.logger.error "update_syllabus_id: syllabus_service/create"
           course.save!
           send_wechat_create_class_notice user,course
         elsif Hash === course
           c = ::Course.new(course)
           c.tea_id = user.id
           c.syllabus_id = sy.id
+          Rails.logger.error "update_syllabus_id: syllabus_service/create"
           c.update_default_value
           c.is_public = 0
           c.save!
@@ -136,6 +138,7 @@ class SyllabusesService
         course.name = c
         course.tea_id = user.id
         course.syllabus_id = sy.id
+        Rails.logger.error "update_syllabus_id: syllabus_service/edit"
         course.update_default_value
         course.is_public = 0
         course.save!

app/views/homework_common/edit.html.erb

@@ -1,5 +1,5 @@
 <script type="text/javascript">
-  <% if @is_in_course == 1 || @course_activity == 1 %>
+  <% if @is_in_course.to_i == 1 || @course_activity == 1 %>
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
@@ -19,13 +19,17 @@
         $("#homework_editor").toggle();
     }
     function cancel_edit(){
-        <% if @is_in_course == 1 %>
+        <% if @is_manage.to_i == 1 %>
+            window.location.href='<%=manage_or_receive_homeworks_user_path(User.current.id) %>';
+        <% elsif @is_manage.to_i == 2 %>
+            window.location.href='<%=my_homeworks_user_path(User.current.id) %>';
+        <% elsif @is_in_course.to_i == 1 %>
             window.location.href='<%=homework_common_index_path(:course => @course.id) %>';
-        <% elsif @is_in_course == 0 %>
+        <% elsif @is_in_course.to_i == 0 %>
             window.location.href='<%=user_homeworks_user_path(User.current.id) %>';
-        <% elsif @is_in_course == -1 && @course_activity == 0 %>
+        <% elsif @is_in_course.to_i == -1 && @course_activity == 0 %>
             window.location.href='<%=user_path(User.current.id) %>';
-        <% elsif @is_in_course == -1 && @course_activity == 1 %>
+        <% elsif @is_in_course.to_i == -1 && @course_activity == 1 %>
             window.location.href='<%=course_path(@course.id) %>';
         <% end %>
     }
@@ -40,6 +44,7 @@
   <%= form_for @homework do |f| %>
       <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
       <input type="text" name="course_activity" class="none" value="<%= @course_activity%>"/>
+      <input type="text" name="is_manage" class="none" value="<%= @is_manage%>"/>
       <div id="HomeWorkCon">
         <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
       </div>

app/views/layouts/_course_base_info.html.erb

@@ -3,6 +3,8 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10">
+  <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %>
+  &nbsp;&gt;&nbsp;
   <% if @course.syllabus %>
       <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
       &nbsp;&gt;&nbsp;
@@ -17,7 +19,9 @@
           <ul class="sy_class_setting_text">
             <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "sy_class_option" %></li>
             <li><%= link_to "复制班级", copy_course_course_path(@course.id),:remote=>true, :class => "sy_class_option" %></li>
-            <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
+            <% if @course.syllabus %>
+                <li><%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %></li>
+            <% end %>
           </ul>
         </li>
       </ul>

app/views/layouts/_show_messages_list.html.erb

@@ -94,6 +94,26 @@
             <span><%= applied_project_tip_header(ma) %>以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
                 <%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
             </span>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 0 %>
+          <li>
+            <% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %>
+            <%= link_to content.html_safe, unapplied_schools_path(:flag => 1, :applied_message_id => ma.id), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”", :target => '_blank' %>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 1 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，已通过审核。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account",:flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，已通过审核。谢谢！", :target => '_blank'%>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 2 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！", :target => '_blank'%>
+          </li>
+      <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 3 %>
+          <li>
+            <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！" %>
+            <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
+          </li>
       <% end %>
     <% elsif ma.class == ForgeMessage %>
       <% if ma.forge_message_type == "AppliedProject" %>
@@ -142,28 +162,6 @@
         <% content = '<span class="shadowbox_news_user">'+ma.author.show_name+' </span>提到了你：'+ma.subject.html_safe %>
         <li><%=link_to content.html_safe, ma.url, :title => ma.author.show_name+' 提到了你：'+ma.subject.html_safe, :target => '_blank' %></li>
       <% end %>
-    <% elsif ma.class == AppliedMessage %>
-        <% if ma.applied_type == "ApplyAddSchools" && ma.status == 0 %>
-              <li>
-                <% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %>
-                <%= link_to content.html_safe, unapplied_schools_path(:flag => 1, :applied_message_id => ma.id), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”", :target => '_blank' %>
-              </li>
-        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 1 %>
-              <li>
-                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，已通过审核。谢谢！" %>
-                <%= link_to content.html_safe, { :controller=> "my",:action => "account",:flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，已通过审核。谢谢！", :target => '_blank'%>
-              </li>
-        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 2 %>
-              <li>
-                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！" %>
-                <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.applied.name}”的申请，因名称不符合规范，系统已将其更改为“#{ma.name}”。谢谢！", :target => '_blank'%>
-              </li>
-        <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 3 %>
-              <li>
-                <% content = "<span class='shadowbox_news_user'>系统提示：</span>“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！" %>
-                <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
-              </li>
-        <% end %>
     <% end %>
   <% end %>
 </ul>

app/views/pull_requests/_form.html.erb

@@ -9,11 +9,11 @@
     </div>
     <div class="new-merge-wrap borderBottomNone">
       <div class="merge-option-name fl" style="padding:5px 0">源分支</div>
-      <%= select_tag :branch, options_for_select(@source_rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
+      <%= select_tag :branch, options_for_select(@source_rev), :id => "source_branch", :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
       <div class="cl mb10"></div>
       <div class="merge-option-name fl" style="padding:5px 0">目标分支</div>
       <% if @forked_project.nil? %>
-          <%= select_tag :branch, options_for_select(@source_rev), :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;", :id => "targetBranch" %>
+          <%= select_tag :branch, options_for_select(@source_rev), :id => "pull_request_branch", :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
       <% else %>
           <select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>);" name="source_project" value="source_project" class="ml30 fontGrey3 fb fl" style = "padding:5px 0 5px 5px;">
             <option value="source_project_name"><%= @source_project_name %></option>
@@ -26,6 +26,8 @@
           </select>
       <% end %>
       <div class="cl"></div>
+      <p id ="pull_request_branch_error" class="ml100 fontGrey2 mt5 c_red" style="display: none">同一个项目的源分支和目标分支不能相同</p>
+      <div class="cl"></div>
     </div>
     <div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
       <a href="javascript:void(0);" class="BlueCirBtn fl ml10" onclick="pull_request_commit()">提交请求</a>
@@ -50,6 +52,22 @@
         }
     }
 
+    function regex_branch()
+    {
+        var source_branch = $.trim($("#source_branch").val());
+        var target_branch = $.trim($("#pull_request_branch").val());
+        if(source_branch == target_branch)
+        {
+            $("#pull_request_branch_error").show();
+            return false;
+        }
+        else
+        {
+            $("#pull_request_branch_error").hide();
+            return true;
+        }
+    }
+
     //提交pull request
     function pull_request_commit()
     {

app/views/pull_requests/_show.html.erb

@@ -21,7 +21,7 @@
     <% else %>
         <% if @request.state == "merged" %>
             <div class="merge-commit-option mt15">
-              <span class="fontGrey3 fb" style="font-size:13px;"><a href="javascript:void(0);" class="link-blue"> <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %></a>于<%= time_tag(@request.created_at) %> 前合并</span><br />
+              <span class="fontGrey3 fb" style="font-size:13px;"><%#= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %> 前合并</span><br />
               <p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
             </div>
         <% else %>

app/views/users/_manage_homework_list.html.erb

@@ -34,7 +34,7 @@
           </p>
         </div>
         <% if homework.student_works.has_committed.count == 0 %>
-            <%= link_to '编&nbsp;&nbsp;&nbsp;&nbsp;辑'.html_safe, edit_homework_common_path(homework), :class => 'hw_btn_green fr mt5', :target => '_blank' %>
+            <%= link_to '编&nbsp;&nbsp;&nbsp;&nbsp;辑'.html_safe, edit_homework_common_path(homework, :is_manage => is_manage), :class => 'hw_btn_green fr mt5', :target => '_blank' %>
         <% else %>
             <%= link_to '评&nbsp;&nbsp;&nbsp;&nbsp;分'.html_safe, student_work_index_path(:homework => homework.id), :class => 'hw_btn_green fr mt5', :target => '_blank' %>
       <% end %>

app/views/users/_my_homework_list.html.erb

@@ -2,10 +2,10 @@
   <span class="sy_cgrey fl"><%= @manage_pre ? '我管理的作业：' : '我收到的的作业：' %></span>
   <%= link_to '查看更多', @manage_pre ? manage_or_receive_homeworks_user_path(@user) : manage_or_receive_homeworks_user_path(@user, :type =>2), :class => 'sy_cgrey fr mr15' %>
 </div>
-<%= render :partial => "#{@manage_pre ? 'manage_homework_list' : 'receive_homework_list'}", :locals => {:homeworks => @manage_pre ? @manage_homeworks : @receive_homeworks} %>
+<%= render :partial => "#{@manage_pre ? 'manage_homework_list' : 'receive_homework_list'}", :locals => {:homeworks => @manage_pre ? @manage_homeworks : @receive_homeworks, :is_manage => 2} %>
 
 <div class="hw_tab_top clear">
   <span class="sy_cgrey fl"><%= @manage_pre ? '我收到的的作业：' : '我管理的作业：' %></span>
   <%= link_to '查看更多', @manage_pre ? manage_or_receive_homeworks_user_path(@user, :type =>2) : manage_or_receive_homeworks_user_path(@user), :class => 'sy_cgrey fr mr15' %>
 </div>
-<%= render :partial => "#{@manage_pre ? 'receive_homework_list' : 'manage_homework_list'}", :locals => {:homeworks => @manage_pre ? @receive_homeworks : @manage_homeworks} %>
+<%= render :partial => "#{@manage_pre ? 'receive_homework_list' : 'manage_homework_list'}", :locals => {:homeworks => @manage_pre ? @receive_homeworks : @manage_homeworks, :is_manage => 2} %>

app/views/users/_user_message_course.html.erb

@@ -601,7 +601,7 @@
             </p>
             <p>申请班级：<%= Course.find(ma.course_id).name%></p>
             <div class="fl">班级描述：</div>
-            <div class="ml60"><%= Course.find(ma.course_id).description.html_safe %></div>
+            <div class="ml60"><%= Course.find(ma.course_id).description.nil? ? "" : Course.find(ma.course_id).description.html_safe %></div>
             <p>申请职位：<%= ma.content == '9'  ? "教师" : "教辅"%></p>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>

app/views/users/manage_or_receive_homeworks.html.erb

@@ -35,7 +35,7 @@
 
   <div class="sy_classbox" style="min-height:800px;" id="my_homework_list">
     <% if @type == 1 %>
-      <%= render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks} %>
+      <%= render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1} %>
     <% else %>
       <%= render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks} %>
     <% end %>

app/views/users/manage_or_receive_homeworks.js.erb

@@ -1,5 +1,5 @@
 <% if @type == 1 %>
-$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks})%>');
+$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1})%>');
 <% else %>
 $("#my_homework_list").html('<%= escape_javascript(render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks})%>');
 <% end %>

app/views/users/search_m_r_homeworks.js.erb

@@ -1,5 +1,5 @@
 <% if @type == 1 %>
-$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks})%>');
+$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1})%>');
 <% else %>
 $("#my_homework_list").html('<%= escape_javascript(render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks})%>');
 <% end %>

app/views/users/show_homework_detail.js.erb

@@ -3,5 +3,5 @@
     $("#choose_courses_notice").html("");
 <% else %>
     var htmlvalue = "<%= escape_javascript(render :partial => 'users/homework_repository_detail') %>";
-    pop_box_new(htmlvalue,820,155);
+    pop_box_new(htmlvalue,820,800);
 <% end %>

app/views/users/user_projects4show.js.erb

@@ -1 +1 @@
-$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page} )%>");
+$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page, :all_count => @all_count} )%>");

lib/gitlab-cli/lib/gitlab/client/merge_requests.rb

@@ -118,8 +118,8 @@ class Gitlab::Client
     # @param  [Integer] project The ID of a project.
     # @param  [Integer] id The ID of a merge request.
     # @return [Gitlab::ObjectifiedHash]
-    def accept_merge_rquest(project, id)
-      put("/projects/#{project}/merge_request/#{id}/merge")
+    def accept_merge_rquest(project, id, gid)
+      put("/projects/#{project}/merge_request/#{id}/merge?user_id=#{gid}")
     end
 
     private

public/javascripts/application.js

@@ -1495,12 +1495,12 @@ function pop_up_box(value,tWidth,tTop,tLeft){
 // 公共弹框样式
 function pop_box_new(value, Width, Height){
     w = ($(window).width() - Width)/2;
-    h = ($(window).height() - Height)/2 - 100;
+    h = ($(window).height() - Height)/2;
     $("#ajax-modal").html(value);
     showModal('ajax-modal', Width + 'px');
     $('#ajax-modal').siblings().remove();
     $('#ajax-modal').parent().css({"top": h+"px","left": w+"px","padding":"0","border":"none","position":"fixed"});
-    $('#ajax-modal').css({"padding":"0"});
+    $('#ajax-modal').css({"padding":"0","overflow":"hidden"});
     $('#ajax-modal').parent().attr("id","popupWrap");
 
     //拖拽

public/stylesheets/sy_public.css

@@ -234,7 +234,7 @@ a.sy_icons_close{
 .hw_popup_top a.hw_icons_close{display:block;width:26px; height:26px;background: url(../images/hw/icons_hw.png) 0 -95px no-repeat; transition: all 0s linear;}
 .hw_popup_top a:hover.hw_icons_close{background: url(../images/hw/icons_hw.png) -41px -95px no-repeat; }
 .hw_popup_con{ width:770px; max-height:770px; margin:0 auto;}
-.hw_popup_txt{width:770px; max-height:700px; margin:15px auto;overflow:auto;}
+.hw_popup_txt{width:770px; max-height:680px; margin:15px auto;overflow:auto;}
 /* 题库发送弹框 */
 .hw_sendpopup_box{ width:460px;background:#fff;padding-bottom:15px;-webkit-border-radius:5px;-moz-border-radius:5px;-o-border-radius:5px;border-radius:5px;-webkit-box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);-moz-box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5);}
 .hw_sendpopup_top{background:#3b94d6;height:40px;-webkit-border-radius: 5px 5px 0px 0px;-o-border-radius: 5px 5px 0px 0px;border-radius: 5px 5px 0px 0px;}

public/stylesheets/syllabus.css

@@ -324,9 +324,10 @@ a.sy_class_option:hover {
     height:110px;
 }
 .sy_class_id{
-    width:110px;
-    height:80px;
-    background:#f1f1f1;
+    width:108px;
+    height:78px;
+    border:1px solid #f1f1f1;
+    background:#fff;
     text-align:center;
     padding-top:30px;
 }