diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 2020915f8..2f50c8105 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/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)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 3d87b007d..adfcd6263 100644
--- a/app/controllers/student_work_controller.rb
+++ b/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
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 3fcc9fb8a..3ba3ee2b2 100644
--- a/app/models/student_work.rb
+++ b/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
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index d4d9d7c16..1bd71e7a9 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/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>
diff --git a/app/views/users/_manage_homework_list.html.erb b/app/views/users/_manage_homework_list.html.erb
index d5e1e82ba..e8912c4c9 100644
--- a/app/views/users/_manage_homework_list.html.erb
+++ b/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 %>
diff --git a/app/views/users/_my_homework_list.html.erb b/app/views/users/_my_homework_list.html.erb
index 31e906576..9548db535 100644
--- a/app/views/users/_my_homework_list.html.erb
+++ b/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} %>
\ No newline at end of file
+<%= render :partial => "#{@manage_pre ? 'receive_homework_list' : 'manage_homework_list'}", :locals => {:homeworks => @manage_pre ? @receive_homeworks : @manage_homeworks, :is_manage => 2} %>
\ No newline at end of file
diff --git a/app/views/users/manage_or_receive_homeworks.html.erb b/app/views/users/manage_or_receive_homeworks.html.erb
index c380fd05d..c16a33c02 100644
--- a/app/views/users/manage_or_receive_homeworks.html.erb
+++ b/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 %>
diff --git a/app/views/users/manage_or_receive_homeworks.js.erb b/app/views/users/manage_or_receive_homeworks.js.erb
index 6f719d1fc..8d1b4e8a9 100644
--- a/app/views/users/manage_or_receive_homeworks.js.erb
+++ b/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 %>
diff --git a/app/views/users/search_m_r_homeworks.js.erb b/app/views/users/search_m_r_homeworks.js.erb
index 4729e53ce..0bffe0e23 100644
--- a/app/views/users/search_m_r_homeworks.js.erb
+++ b/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 %>