From 3b90bd47702f284e0ab99eaa9515463296b08bea Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 13:48:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/_homework_common_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb index 28aa490de..fa45397f0 100644 --- a/app/views/homework_common/_homework_common_form.html.erb +++ b/app/views/homework_common/_homework_common_form.html.erb @@ -4,7 +4,7 @@ *  <%= l(:field_name)%>：  - +

From b5dce61c9ed1b4067c4658d66716421a8b31338c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 14:21:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AD=A6=E5=8F=B7=E4=B8=BAa=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_title.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb index 8162ea971..6fb7e248b 100644 --- a/app/views/student_work/_student_work_title.html.erb +++ b/app/views/student_work/_student_work_title.html.erb @@ -1,5 +1,5 @@
  • - 学号 + 学号
  • 学生姓名 From d62e7218ccfd09a0ef718d278f9974ca3d282cdc Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 13 Jun 2015 14:37:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members.html.erb | 70 +++++++++++----------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index a6a13e2b7..6066404bc 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -19,7 +19,7 @@
    > - 搜索 + 搜索 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
    @@ -48,7 +48,7 @@ <% end %>
    - + <%= l(:label_invite_members)%>
    @@ -67,37 +67,39 @@ var text=$(label).text(); $(label).attr("title",text); } - - function nh_show_err_message(msg){ - $("#RSide>.flash").remove(); - $("#RSide").prepend('
    '+msg+'
    '); - } - $('#new_membership').submit(function(){ - var user_ischeck=false; - $("input[name='membership[user_ids][]']").each(function(){ - if($(this).prop('checked')){ - user_ischeck=true; - } - }); - var role_ischeck=false; - $("input[name='membership[role_ids][]']").each(function(){ - if($(this).prop('checked')){ - role_ischeck=true; - } - }); - if(user_ischeck==false && role_ischeck==false){ - nh_show_err_message('请选择用户和角色！'); - return false; - } - if(user_ischeck==false){ - nh_show_err_message('请选择用户！'); - return false; - } - if(role_ischeck==false){ - nh_show_err_message('请选择角色！'); - return false; - } - return true; - }); }); + + function nh_show_err_message(msg){ + $("#RSide>.flash").remove(); + $("#RSide").prepend('
    '+msg+'
    '); + } + + function submit_invite_members() + { + var user_ischeck=false; + $("input[name='membership[user_ids][]']").each(function(){ + if($(this).prop('checked')){ + user_ischeck=true; + } + }); + var role_ischeck=false; + $("input[name='membership[role_ids][]']").each(function(){ + if($(this).prop('checked')){ + role_ischeck=true; + } + }); + if(user_ischeck==false && role_ischeck==false){ + nh_show_err_message('请选择用户和角色！'); + return false; + } + if(user_ischeck==false){ + nh_show_err_message('请选择用户！'); + return false; + } + if(role_ischeck==false){ + nh_show_err_message('请选择角色！'); + return false; + } + $('#new_membership').submit(); + } \ No newline at end of file