From 0b524b8a407989f008a448f6b9c6662e8ca9b76d Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 5 May 2015 16:29:53 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=88=91=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E6=96=B9=E6=B3=95=E5=AE=9A=E4=B9=89=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 6 ++++++ app/helpers/welcome_helper.rb | 4 ++++ app/views/users/user_projects.html.erb | 4 ++-- config/locales/projects/zh.yml | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index f35210f01..6e067fb83 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -58,12 +58,18 @@ class WelcomeController < ApplicationController else case @first_page.sort_type when 0 + @my_projects = find_my_projects + @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : [] @projects = find_miracle_project(10, 3,"created_on desc") #@projects = @projects_all.order("created_on desc") when 1 + @my_projects = find_my_projects + @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : [] @projects = find_miracle_project(10, 3,"score desc") #@projects = @projects_all.order("grade desc") when 2 + @my_projects = find_my_projects + @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : [] @projects = find_miracle_project(10, 3,"watchers_count desc") #@projects = @projects_all.order("watchers_count desc") diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index f6e205e82..4800a949a 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -443,6 +443,10 @@ module WelcomeHelper resultSet.take(limit) end + def find_my_projects + my_projects = User.current.memberships.all(conditions: "projects.project_type = 0") + end + def sort_project_by_hot_rails project_type=0, order_by='score DESC', limit=15 # Project.find_by_sql(" # SELECT p.id, p.name, p.description, p.identifier, t.project_id diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 31b66727f..69dda693e 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -39,9 +39,9 @@ - + - + <% end %> diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index e371296a5..d89fc33ee 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -415,3 +415,4 @@ zh: # field_sharing: 共享 label_title_code_review: 代码评审 + label_home_non_project: 您还没有创建项目，您可能对系统的其它项目感兴趣！ \ No newline at end of file From c60ea1db842f6b817260368fc955577d1af0526a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 5 May 2015 16:33:01 +0800 Subject: [PATCH 02/22] 111 --- db/schema.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 006b26e91..dcbe017fb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -654,16 +654,6 @@ ActiveRecord::Schema.define(:version => 20150428021035) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" From 2e26e272980ac8b1f5c74d48e5e8b06cfe824a21 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 5 May 2015 17:08:46 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E5=90=8E=E4=B9=8B=E4=BF=9D=E5=AD=98=E5=9C=A8cookie?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=90=8E?= =?UTF-8?q?=E4=BB=8D=E4=BF=9D=E6=8C=81=E6=94=B6=E8=B5=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 2 +- app/views/repositories/show.html.erb | 2 +- public/javascripts/cookie.js | 39 ++++++++++++++++++++++++ public/javascripts/project.js | 30 +++++++++--------- 4 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 public/javascripts/cookie.js diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 64a9111e0..958d62975 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -13,7 +13,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %> - <%= javascript_include_tag 'project', 'header','select_list_move' %> + <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 9d545d89a..96e3b84be 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -30,7 +30,7 @@

-
收起Git操作指南
+
收起Git操作指南

diff --git a/public/javascripts/cookie.js b/public/javascripts/cookie.js new file mode 100644 index 000000000..9e14ed810 --- /dev/null +++ b/public/javascripts/cookie.js @@ -0,0 +1,39 @@ +//保存cookie +//n:cookie的名字 +//v:cookie的值 +//mins:时间（分钟） +//dn: +//path:保存路径 +function cookiesave(n, v, mins, dn, path) +{ + if(n) + { + + if(!mins) mins = 365 * 24 * 60; + if(!path) path = "/"; + var date = new Date(); + + date.setTime(date.getTime() + (mins * 60 * 1000)); + + var expires = "; expires=" + date.toGMTString(); + + if(dn) dn = "domain=" + dn + "; "; + document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path; + + } +} + +//获取cookie +function cookieget(n) +{ + var name = n + "="; + var ca = document.cookie.split(';'); + for(var i=0;i Date: Tue, 5 May 2015 17:19:06 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=BE=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 36 ++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 42bf8fe3f..94efb375a 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -433,18 +433,48 @@ class CoursesService result = [] @course = Course.find(params[:course_id]) @attachments = @course.attachments.order("created_on desc") - @attachments.each do |atta| - result << {:filename => atta.filename,:description => atta.description,:downloads => atta.downloads,:quotes => atta.quotes.nil? ? 0 :atta.quotes } + if !params[:name].nil? && params[:name] != "" + @attachments.each do |atta| + result << {:filename => atta.filename, + :description => atta.description, + :downloads => atta.downloads, + :quotes => atta.quotes.nil? ? 0 :atta.quotes } if atta.filename.include?(params[:name]) + + end + else + @attachments.each do |atta| + result << {:filename => atta.filename, + :description => atta.description, + :downloads => atta.downloads, + :quotes => atta.quotes.nil? ? 0 :atta.quotes } + + end end result end # 课程学生列表 def course_members params - @all_members = student_homework_score(0,params[:course_id], 10,"desc") + @all_members = searchmember_by_name(student_homework_score(0,params[:course_id], 10,"desc"),params[:name]) end private + def searchmember_by_name members, name + #searchPeopleByRoles(project, StudentRoles) + mems = [] + if name != "" + name = name.to_s.downcase + members.each do |m| + username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase + if(m.user[:login].to_s.downcase.include?(name) || m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name)) + mems << m + end + end + else + mems = members + end + mems + end def show_homework_info course,bid,current_user,is_course_teacher author_real_name = bid.author.lastname + bid.author.firstname many_times = course.homeworks.index(bid) + 1 From 3da5fdfa0fb45bebcd912e42774f64863dc32fae Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 5 May 2015 17:19:31 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=BE=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/apis/courses.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/api/mobile/apis/courses.rb b/app/api/mobile/apis/courses.rb index f7b03947c..0d0c4651f 100644 --- a/app/api/mobile/apis/courses.rb +++ b/app/api/mobile/apis/courses.rb @@ -232,6 +232,7 @@ module Mobile params do requires :token, type: String requires :course_id,type: Integer,desc: '课程id' + optional :name,type:String,desc:'课件名称可能包含的字符' end get ":course_id/attachments" do cs = CoursesService.new @@ -244,6 +245,7 @@ module Mobile params do requires :token,type:String requires :course_id,type:Integer,desc: '课程id' + optional :name,type:String,desc:'学生的姓名或者昵称或者学号可能包含的字符' end get ":course_id/members" do cs = CoursesService.new From b39e00b5c7f16ff9bcc9c11d72fa67b19830acc3 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 09:26:14 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA--=E5=86=85=E5=AE=B9=E5=BF=85=E5=A1=AB=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_form_project.html.erb | 2 +- config/locales/projects/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index 5724acf47..8e72544b5 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -25,7 +25,7 @@
  • - + <%= text_area :quote,:quote,:style => 'display:none' %> <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
    diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index d89fc33ee..c1850b7e4 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -415,4 +415,4 @@ zh: # field_sharing: 共享 label_title_code_review: 代码评审 - label_home_non_project: 您还没有创建项目，您可能对系统的其它项目感兴趣！ \ No newline at end of file + label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！ \ No newline at end of file From c0b78198700562b0a442e51c0d839ea2c51fd3e9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 14:20:55 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?= =?UTF-8?q?=E6=97=B6=E6=98=B5=E7=A7=B0=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 2 +- config/locales/account/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 785286eea..6c0c3a78a 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -117,7 +117,7 @@
    -

    +

    <%= f.text_field :login, :required => true, :size => 25, :name => "login", :style => 'border:1px solid #d3d3d3;'%> <%= l(:label_max_number) %>
    diff --git a/config/locales/account/zh.yml b/config/locales/account/zh.yml index 97e6ae444..69edc7aa3 100644 --- a/config/locales/account/zh.yml +++ b/config/locales/account/zh.yml @@ -11,7 +11,7 @@ zh: # # 公共变量 # - label_max_number: "登录名是在网站中显示的您的公开标识，只能为英文和数字。" + label_max_number: "登录名是在网站中显示的您的公开标识，只能为下划线、@、.以及英文和数字。" field_login: 登录名 field_password: 密码 From 6bbf8c8f45bbbfc10b9a7cf5696ca820605727cf Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 14:53:25 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=88=A0=E9=99=A4=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E5=86=85=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courses_jours.html.erb | 2 +- app/views/news/_course_show.html.erb | 8 +------- public/stylesheets/courses.css | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index 69e600b94..adbbf4780 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -15,7 +15,7 @@ <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> <%= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;", :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%> - 取  消 + 取  消 <%= l(:button_leave_meassge)%> diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 1160f09e3..2ead9173a 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -1,9 +1,3 @@ - <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>

    <%= l(:label_course_news) %>

    @@ -39,7 +33,7 @@ <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>

    - + <%= l(:label_cancel_with_space) %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index d93bc8519..bb7294e2e 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -174,7 +174,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;} .wzan a{ display: block;} a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;} a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} -.msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;} +.msg_box{ width:670px; height:225px; border-bottom:1px dashed #CCC; padding-top:10px;} .msg_box h4{ } .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; } From 4c268b13dd86daf2fbf74ce27ab60d47e237c052 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 14:55:48 +0800 Subject: [PATCH 09/22] =?UTF-8?q?#2460=E5=8C=BF=E8=AF=84=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_new_homework_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb index 16f78491b..7a5f628f9 100644 --- a/app/views/bids/_new_homework_form.html.erb +++ b/app/views/bids/_new_homework_form.html.erb @@ -35,7 +35,7 @@

  • - + <%= l(:label_evaluation_description)%>

    • From cba760b8b0815f704e4af79236f71758d3cec6c2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 15:01:26 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=90=9C=E7=B4=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course_members.html.erb | 2 +- app/views/projects/_project_members.html.erb | 2 +- app/views/projects/settings/_new_members.html.erb | 2 +- config/locales/projects/zh.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb index 88ac405dc..78dc6c319 100644 --- a/app/views/courses/_course_members.html.erb +++ b/app/views/courses/_course_members.html.erb @@ -21,7 +21,7 @@ <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
    - + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js',:flag => true) }')" %>
    diff --git a/app/views/projects/_project_members.html.erb b/app/views/projects/_project_members.html.erb index 3f91f9269..fd121aad7 100644 --- a/app/views/projects/_project_members.html.erb +++ b/app/views/projects/_project_members.html.erb @@ -20,7 +20,7 @@ <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
    - + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@project, :format => 'js',:flag => true) }')" %>
    diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 7abe6198c..2cdcd4cf5 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -91,7 +91,7 @@

    <%= l(:label_member_new) %>

    <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
    - + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
    diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index c1850b7e4..1b17347c3 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -338,7 +338,7 @@ zh: label_input_email: 请输入邮箱地址 label_invite_trustie_user: "邀请Trustie注册用户" - label_invite_trustie_user_tips: "请输入用户名称来搜索好友" + label_invite_trustie_user_tips: "输入姓名、邮箱、昵称" label_user_role_null: 用户和角色不能留空！ label_invite_project: 邀请您加入项目 label_invite_success: 邀请成功 From a5a5ccce41f2abd9192eb02357d1b2166c0e1bda Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 15:05:57 +0800 Subject: [PATCH 11/22] =?UTF-8?q?#2452course=E7=BD=91=E7=AB=99=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E8=B5=84=E6=BA=90=E4=B8=AA=E6=95=B0=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=92=8C=E4=B8=BB=E9=A1=B5=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_course_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb index da6c0fbf0..0d979c769 100644 --- a/app/views/welcome/_course_list.html.erb +++ b/app/views/welcome/_course_list.html.erb @@ -27,7 +27,7 @@ (<%= course.members.count %>人) <% files_count = course.attachments.count %> <% if files_count > 0%> - (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>资料) + (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料) <% end %>
    From a7b2ac860b2804ab16ea857145d7ec8052463fa9 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 15:40:13 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6=E4=B8=8D=E8=83=BD=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_project_file_list.html.erb | 8 ++++---- ...0505025003_add_index_to_homeworkforcourse_course_id.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index 53ff70bbe..a53ebabc7 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -24,14 +24,14 @@ <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% if manage_allowed && file.container_id == project.id && file.container_type == "Project" %> - - <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %> - + + <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %> + <% else %> <% end %> <% else %> - <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> + <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(frrrffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc443333333333333333333),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% end %> <% else %> <% end %> diff --git a/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb index cd60a00af..066ed5980 100644 --- a/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb +++ b/db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb @@ -1,4 +1,4 @@ -class AddIndexToHomeworkattachCourseId < ActiveRecord::Migration +class AddIndexToHomeworkforcourseCourseId < ActiveRecord::Migration def change add_index(:homework_for_courses,:course_id) end From e32a065c09fa8687fb7829402b9ed8e93ddc8043 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 15:47:02 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E8=AF=84=E5=88=86=E7=95=8C=E9=9D=A2=E5=90=8E=E4=BC=9A=E8=B7=B3?= =?UTF-8?q?=E5=88=B0=E6=9C=80=E9=A1=B6=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_attach/show.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/homework_attach/show.js.erb b/app/views/homework_attach/show.js.erb index fdae16fb5..953d8bab2 100644 --- a/app/views/homework_attach/show.js.erb +++ b/app/views/homework_attach/show.js.erb @@ -3,7 +3,7 @@ showModal('ajax-modal', '513px'); $('#ajax-modal').css('height','569px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + - "    "); + ""); $('#ajax-modal').parent().removeClass("alert_praise"); $('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').parent().addClass("alert_box"); From fd28310e15c9d02deac70a24b30ff49ccf52a320 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 16:37:18 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A4=AA=E9=95=BF=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course.html.erb | 4 ++-- public/stylesheets/project.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index 0e1b5caa6..755dd63b0 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -58,14 +58,14 @@ <%= content_tag('span', "#{garble @course.members.count}", :class => "info") %> <%= content_tag('span', l(:label_x_member, :count => memberCount(@course))) %>

    - +

    <%= content_tag('span', link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %> <%= content_tag('span', l(:label_x_activity, :count => @course_activity_count[@course.id])) %>

    - +
    <% if(course_endTime_timeout? @course) %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 019ffa57a..c22c90bf8 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -76,7 +76,7 @@ a.problem_name{ color:#ff5722; } a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} a.problem_tit02{ color:#0781b4; font-weight:bold;max-width:400px;} -.problem_tit_div{ color:#0781b4; font-weight:bold;width:400px; } +.problem_tit_div{ color:#0781b4; font-weight:bold;max-width:400px; } a.problem_tit_a{ color:#0781b4; } .problem_tit_a:hover{ color:#09658c; } a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; } From b456bc0e62f45cd5f37dcecd60952ec1de67570e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 6 May 2015 16:55:59 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E8=AF=84=E5=88=86=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=930=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 3 ++- app/views/homework_attach/_homework.html.erb | 2 +- app/views/homework_attach/_review.html.erb | 2 +- app/views/homework_attach/_show_star.html.erb | 1 + public/stylesheets/css.css | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 4982a4b6b..523e430fb 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -445,7 +445,8 @@ class HomeworkAttachController < ApplicationController is_teacher = @is_teacher ? 1 : 0 #保存评分@homework.rate(@m_score.to_i,User.current.id,:quality, (@is_teacher ? 1 : 0)) @is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论？匿评？留言 - if @m_score && (@is_teacher || @is_anonymous_comments) + if @is_teacher || @is_anonymous_comments + @m_score ||= 0 rate = @homework.rates(:quality).where(:rater_id => User.current.id, :is_teacher_score => is_teacher).first if rate rate.stars = @m_score diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb index 466444528..973dbc51a 100644 --- a/app/views/homework_attach/_homework.html.erb +++ b/app/views/homework_attach/_homework.html.erb @@ -32,7 +32,7 @@ <% unless is_student_batch_homework %> <%= l(:label_teacher_score)%>: - <%= (homework.t_score.nil? || (homework.t_score && homework.t_score.to_i == 0)) ? l(:label_without_score) : format("%.2f",homework.t_score)%> + <%= (homework.t_score.nil?) ? l(:label_without_score) : format("%.2f",homework.t_score)%>    <% end %> diff --git a/app/views/homework_attach/_review.html.erb b/app/views/homework_attach/_review.html.erb index 876980168..15203e8fc 100644 --- a/app/views/homework_attach/_review.html.erb +++ b/app/views/homework_attach/_review.html.erb @@ -26,7 +26,7 @@ <%= format_time(review.created_at) %> - <% if review.stars && review.stars.to_i > 0%> + <% if review.stars%> <%= l(:label_work_rating) %>： diff --git a/app/views/homework_attach/_show_star.html.erb b/app/views/homework_attach/_show_star.html.erb index 80f9d7f54..6cb901875 100644 --- a/app/views/homework_attach/_show_star.html.erb +++ b/app/views/homework_attach/_show_star.html.erb @@ -1,3 +1,4 @@ +零分 diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 3ef981910..fa5465dba 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -86,7 +86,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .ping_con h2{ font-size:14px; color:#444443; margin-bottom:10px; } .ping_con p{ color:#777777; font-size:12px; border-bottom:1px dashed #CCC; padding-bottom:5px;} .ping_con p span a{ color:#777777;} -.ping_star{ width:165px; color:#333; font-weight:bold; margin-bottom:5px;} +.ping_star{ width:185px; color:#333; font-weight:bold; margin-bottom:5px;} .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png);background-repeat: no-repeat; margin-right:3px;} .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px; background:#15bccf; color:#fff; text-align:center;} From aabdd1a4d77e3d32b47cb60b0695cf5364e16102 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 6 May 2015 16:56:08 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=8A=B6=E6=80=81=E6=97=B6=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/trackers_controller.rb | 13 +++++++------ app/views/files/_project_file_list.html.erb | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 01bc47a2f..64ad9c83a 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -38,12 +38,13 @@ class TrackersController < ApplicationController @tracker ||= Tracker.new(params[:tracker]) @trackers = Tracker.sorted.all @projects = Project.where("project_type = #{Project::ProjectType_project}").all - @courses = Course.all - @course_activity_count=Hash.new - @courses.each do |course| - @course_activity_count[course.id]=0 - end - @course_activity_count=get_course_activity @courses,@course_activity_count + # 去掉原因，这块代码已经没有用到 + # @courses = Course.all + # @course_activity_count=Hash.new + # @courses.each do |course| + # @course_activity_count[course.id]=0 + # end + # @course_activity_count=get_course_activity @courses,@course_activity_count end def create diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index a53ebabc7..3dd5134d7 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -31,7 +31,7 @@ <% end %> <% else %> - <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(frrrffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc443333333333333333333),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> + <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %> <% end %> <% else %> <% end %> From 3c72af69ea6ba936028e48839c97375c5e62e446 Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 6 May 2015 17:41:18 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=97=B6=E2=80=9Cgit=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=87=E5=8D=97=E2=80=9D=E5=B1=95=E5=BC=80=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 2 +- public/javascripts/project.js | 22 ++++++++++++++++++++++ public/stylesheets/project.css | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 96e3b84be..ceb675dcb 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -30,7 +30,7 @@

    -
    收起Git操作指南
    +
    展开Git操作指南

    diff --git a/public/javascripts/project.js b/public/javascripts/project.js index f85f744e3..6dbb0ff6b 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -71,13 +71,35 @@ function showhelpAndScrollTo(id) { { cookiesave("repositories_visiable", true,'','',''); } + var information = $("#showgithelp"); + var val = information.attr("value"); + if(val=="show_help") + { + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } + else + { + $("#showgithelp").text("展开Git操作指南"); + information.attr("value", "show_help"); + } } + + $(function(){ + var information = $("#showgithelp"); + var val = information.attr("value"); if(cookieget("repositories_visiable") == "true") { $('#repos_git_more').hide(); } + else + { + $('#repos_git_more').show(); + $("#showgithelp").text("收起Git操作指南"); + information.attr("value", "hide_help"); + } }); diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 019ffa57a..a5554fd6b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -180,6 +180,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col /* 版本库展示Git操作文档 */ .repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;} .lh23{line-height: 23px;} +.repos_git_more{display: none;} /* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */ .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;} From 700d2985f6331961d2189b3a64784e7968f2729c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:02:56 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 6 +++++- app/views/issues/index.html.erb | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 80be8c5d5..bd905dec0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -75,7 +75,11 @@ class IssuesController < ApplicationController else @limit = 10#per_page_option end - + @assign_to_id = params[:assign_to_id] + @author_id = params[:author_id] + @priority_id = params[:priority_id] + @status_id = params[:status_id] + @subject = params[:subject] @issue_count = @query.issue_count @issue_pages = Paginator.new @issue_count, @limit, params['page'] @offset ||= @issue_pages.offset diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 3fb604f06..9445d88cf 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,31 +34,31 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
    - + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索
    <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@assign_to_id.nil? ? @assign_to_id : 0 }, {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} ) %> <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@priority_id ? @priority_id : 0 }, {:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"} ) %> <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@status_id ? @status_id : 0 }, {:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"} ) %> <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]), - { :include_blank => false,:selected=>0 + { :include_blank => false,:selected=>@author_id ? @author_id : 0 }, {:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"} ) From 6c7b92558ceea30ce2cb35d84802e3270a379cc4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:08:29 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9445d88cf..c1c3ab957 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,7 +34,7 @@ <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
    - " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> + " onkeypress="EnterPress(event)" onkeydown="EnterPress()"> 搜索
    From f08357d300158690b965ba20de9f38a40b39d443 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 7 May 2015 09:17:47 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E7=BB=99=E8=80=81=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/commons/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 1703ac193..231c5280a 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -351,7 +351,7 @@ zh: # 意见反馈 # label_feedback: 意见反馈 - label_feedback_tips: "有什么想说的，尽管来咆哮吧~~" + label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!" label_technical_support: "技术支持：" label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" label_feedback_value: "该帖来自用户反馈:)" From 1cb3dfc833b24cebdca8f9f76c6b02abf5c44735 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:20:11 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index c1c3ab957..6e89e5e10 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -40,7 +40,7 @@
    <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]), - { :include_blank => false,:selected=>@assign_to_id.nil? ? @assign_to_id : 0 + { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0 }, {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"} ) From c9d66c7f5f5b0fd2f04ba45738ecb2e504f857ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 7 May 2015 09:22:30 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index bd905dec0..12ee4bc3b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -75,7 +75,7 @@ class IssuesController < ApplicationController else @limit = 10#per_page_option end - @assign_to_id = params[:assign_to_id] + @assign_to_id = params[:assigned_to_id] @author_id = params[:author_id] @priority_id = params[:priority_id] @status_id = params[:status_id]