From 19bf8ef50dc85a0c7475adaa1a8168b62e753020 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 28 May 2015 17:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=AE=E6=94=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 26 +++++- app/helpers/application_helper.rb | 2 +- app/views/student_work/_show.html.erb | 2 +- app/views/student_work/edit.html.erb | 100 +++++++-------------- app/views/student_work/new.html.erb | 4 +- public/javascripts/course.js | 12 ++- 6 files changed, 69 insertions(+), 77 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 7e7126173..710811960 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -72,11 +72,31 @@ class StudentWorkController < ApplicationController end def edit - + respond_to do |format| + format.html + end end def update - + if params[:student_work] + @work.name = params[:student_work][:name] + @work.description = params[:student_work][:description] + @work.project_id = params[:student_work][:project] + @work.save_attachments(params[:attachments]) + render_attachment_warning_if_needed(@work) + if @work.save + respond_to do |format| + format.html { + flash[:notice] = l(:notice_successful_edit) + redirect_to student_work_index_url(:homework => @homework.id) + } + end + return + end + end + respond_to do |format| + format.html{redirect_to edit_student_work_url(@work)} + end end def show @@ -208,7 +228,7 @@ class StudentWorkController < ApplicationController #判断是不是当前作品的提交者 #提交者可以编辑作品 def author_of_work - render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 ) + # render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 ) end #根据条件过滤作业结果 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3d178e28e..446ad994b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2298,7 +2298,7 @@ module ApplicationHelper link_to l(:label_commit_homework), new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit' else if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前 - "#{l(:label_edit_homework)}".html_safe + "#{l(:label_edit_homework)}".html_safe else link_to l(:label_edit_homework), edit_student_work_path(work.id),:class => 'fr mr10 work_edit' end diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index 97c6125f7..de14c0cb1 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -11,7 +11,7 @@
  • - + <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
    • <% end%> <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%> diff --git a/app/views/student_work/edit.html.erb b/app/views/student_work/edit.html.erb index a9bb9760e..e4ae4c6a5 100644 --- a/app/views/student_work/edit.html.erb +++ b/app/views/student_work/edit.html.erb @@ -2,98 +2,58 @@

    编辑作品

    -
    - - -
    + + + + + + + +
    + <%= labelled_form_for @work do |f|%>

    - - 项目信息 + + 项目信息 + + +

    +

    -

    + +

    - - 快速创建 + <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"} %>

    +

    - - + + +

    - -     -文件不超过200MB + + <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>

    - 提交作品重  置 + 提交作品 + <%= link_to "返  回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>

    + <% end%>
    -
    -
    - -
    -
    -

    添加成员

    -
    - 搜索 -
    -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    -
    - -
    -
      -
    • 角色：
      • -
      • -
      • -
      • -
    -
    - 新增成员 -
    -
    -
    diff --git a/app/views/student_work/new.html.erb b/app/views/student_work/new.html.erb index fc645c26d..ff5bbf1aa 100644 --- a/app/views/student_work/new.html.erb +++ b/app/views/student_work/new.html.erb @@ -14,7 +14,9 @@

    <%= f.text_field "name", :required => true, :size => 60, :class => "bo fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %> - 项目信息 + 项目信息 + +

    diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 97ee2bd93..a718db944 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -652,6 +652,12 @@ function new_student_work() {$("#new_student_work").submit();} } +function edit_student_work(id) +{ + if(regexStudentWorkName()&®exStudentWorkDescription()) + {$("#edit_student_work_" + id).submit();} +} + //滑动打分 $.fn.peSlider = function(settings){ //configurable options (none so far) @@ -799,4 +805,8 @@ function SearchByName(obj,url,event) if(keycode == '13'){ location.href = url + "&name=" + obj.val(); } -} \ No newline at end of file +} + +$(function(){ + $("#about_project label").eq(1).remove(); +}); \ No newline at end of file