From 8b356cddb1c6cddd6e89c0fee02f43acda488f3e Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Sat, 24 May 2014 09:30:23 +0800 Subject: [PATCH 01/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=95=99=E8=A8=80=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/_new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/contests/_new.html.erb b/app/views/contests/_new.html.erb index 2462d3fb..804c5942 100644 --- a/app/views/contests/_new.html.erb +++ b/app/views/contests/_new.html.erb @@ -45,7 +45,7 @@ <% else %> -
+
<%= l(:label_user_login_tips) %> <%= link_to l(:label_user_login_new), signin_path %>
From 7b6c96a8b63f0b362148b3c76731b3c682126f40 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Sat, 24 May 2014 10:56:58 +0800 Subject: [PATCH 02/46] =?UTF-8?q?view=E4=B8=ADcontests=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B7=B2=E7=BB=8F=E5=85=A8=E9=83=A8=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contests/_list_softapplications.html.erb | 6 +- app/views/contests/_new_join.html.erb | 2 +- app/views/contests/add.js.erb | 2 +- app/views/contests/add_softapplication.js.erb | 2 +- .../contests/show_attendingcontest.html.erb | 56 +++++++++---------- app/views/contests/show_project.html.erb | 2 +- .../contests/show_softapplication.html.erb | 2 +- config/locales/zh.yml | 23 ++++++++ 8 files changed, 59 insertions(+), 36 deletions(-) diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb index 9b99b675..89e8a317 100644 --- a/app/views/contests/_list_softapplications.html.erb +++ b/app/views/contests/_list_softapplications.html.erb @@ -4,7 +4,7 @@
- 应用软件: + <%=l(:label_softapplication)%>: <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> @@ -12,7 +12,7 @@
- 简介: + <%=l(:label_profile)%>: <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> @@ -20,7 +20,7 @@
- 发布时间： + <%=l(:label_activity_time)%>： <%=format_time c_softapplication.created_at %> diff --git a/app/views/contests/_new_join.html.erb b/app/views/contests/_new_join.html.erb index c764690d..3b0cff69 100644 --- a/app/views/contests/_new_join.html.erb +++ b/app/views/contests/_new_join.html.erb @@ -36,7 +36,7 @@ } -

请输入竞赛密码

+

<%=l(:label_please_input_password)%>

<%= form_tag( join_in_contest_contests_path(id: contest.id), :remote => true, diff --git a/app/views/contests/add.js.erb b/app/views/contests/add.js.erb index 9c696d8a..0706d0c5 100644 --- a/app/views/contests/add.js.erb +++ b/app/views/contests/add.js.erb @@ -1,4 +1,4 @@ $('#contesting_project_list').html('<%= escape_javascript(render(:partial => 'project_list', :locals => {:contesting_project => @contesting_project})) %>'); -$("#project_id").val("请选择项目"); +$("#project_id").val("<%= l(:label_please_select_project) %>"); $("#contest_message").val( "<%= l(:label_bid_reason) %>" ); $("#put-bid-form").hide(); \ No newline at end of file diff --git a/app/views/contests/add_softapplication.js.erb b/app/views/contests/add_softapplication.js.erb index 6071c707..dfe77410 100644 --- a/app/views/contests/add_softapplication.js.erb +++ b/app/views/contests/add_softapplication.js.erb @@ -1,4 +1,4 @@ $('#contesting_softapplication_list').html('<%= escape_javascript(render(:partial => 'softapplication_list', :locals => {:contesting_softapplication => @contesting_softapplication})) %>'); -$("#softapplication_id").val("请选择参赛应用"); +$("#softapplication_id").val("<%= l(:label_please_select_contestingsoftapplication) %>"); $("#contest_message").val( "<%= l(:label_bid_reason) %>" ); $("#put-bid-form").hide(); \ No newline at end of file diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index bbd01c24..017659d7 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -62,16 +62,16 @@ <%= render_flash_messages %>
-
温馨提示：如果您准备参加竞赛，请点击下面的"新建参赛作品"！
-
1) 若您已完成开发，且只希望发布您的作品，“托管项目”一项可以不选；
-
2) 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹，请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目，若您还没有创建项目，请点击右边的“创建项目”，然后回到本页再选择。
+
<%= l(:label_wellmeaning_intimation_contentone)%>
+
1) <%= l(:label_wellmeaning_intimation_contenttwo)%>
+
2) <%= l(:label_wellmeaning_intimation_contentthree)%>
<% if User.current.logged? %>
- 参加竞赛： - <%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %> + <%= l(:label_attending_contest)%>： + <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %>
<% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> - <%= toggle_link '评奖', c_project.id.to_s %> + <%= toggle_link l(:label_reward), c_project.id.to_s %> @@ -240,13 +240,13 @@
- 简介: + <%= l(:label_profile)%>: <%= c_project.project.description.truncate(90, omission: '...') %>
- 参赛时间：<%= format_time c_project.created_at%> - 参赛代表：<%= c_project.user.name %> + <%= l(:label_attendingcontest_time)%>：<%= format_time c_project.created_at%> + <%= l(:label_attendingcontest_spoksman)%>：<%= c_project.user.name %>
@@ -262,26 +262,26 @@
- 参赛作品: + <%= l(:label_contest_work)%>: <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %>
- 简介: + <%= l(:label_profile)%>: <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
- 参赛时间：<%= format_time c_softapplication.created_at %> - 参赛代表：<%= c_softapplication.softapplication.user.name %> + <%= l(:label_attendingcontest_time)%>：<%= format_time c_softapplication.created_at %> + <%= l(:label_attendingcontest_spoksman)%>：<%= c_softapplication.softapplication.user.name %>
- 最终得分：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分 + <%= l(:label_final_scores)%>：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分 @@ -321,15 +321,15 @@
diff --git a/app/views/contests/show_project.html.erb b/app/views/contests/show_project.html.erb index 202d3b63..3e759cfc 100644 --- a/app/views/contests/show_project.html.erb +++ b/app/views/contests/show_project.html.erb @@ -68,7 +68,7 @@

- <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target=>'_blank'%> + <%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target=>'_blank'%>

diff --git a/app/views/contests/show_softapplication.html.erb b/app/views/contests/show_softapplication.html.erb index 14c907d8..d12a70e3 100644 --- a/app/views/contests/show_softapplication.html.erb +++ b/app/views/contests/show_softapplication.html.erb @@ -68,7 +68,7 @@

- <%= link_to '发布应用', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %> + <%= link_to l(:label_release_softapplication), new_softapplication_path(:target=>'_blank'), :target=>'_blank' %>

diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 96b37e76..746e52c2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1722,6 +1722,8 @@ zh: label_first_reward: 一等奖 label_second_reward: 二等奖 label_third_reward: 三等奖 + label_fourth_reward: 四等奖 + label_fifth_reward: 五等奖 label_excellence_reward: 优秀奖 label_comfort_reward: 入围奖 label_course_settings: 课程设置 @@ -1894,6 +1896,7 @@ zh: label_button_ok: 确定 label_tags_contest: 竞赛标签 label_tags_contest: 竞赛名称 + label_final_scores: 最终得分 label_tags_contest_description: 竞赛描述 label_release_add_contest_succeed: 该应用发布并添加成功. label_add_contest_succeed_fail: 添加失败,该应用已参赛. @@ -1918,10 +1921,30 @@ zh: label_contest_settings: 配置竞赛 label_contest_delete: 删除竞赛 label_noawards_current: 暂未评奖 + + label_softapplication: 应用软件 + label_attending_contest: 参加竞赛 + label_new_attendingcontest_work: 新建参赛作品 + label_workname_lengthlimit: 25个汉字以内 + label_workdescription_lengthlimit: 125个汉字以内 + label_please_input_password: 请输入竞赛密码 + label_please_select_project: 请选择项目 + label_upload_softworkpacket_photo: 上传作品软件包和作品截图 + label_reward: 评奖 + label_please_select_contestingsoftapplication: 请选择参赛应用 + label_attendingcontest_time: 参赛时间 + label_attendingcontest_spoksman: 参赛代表 + label_wellmeaning_intimation_contentone: 温馨提示：如果您准备参加竞赛，请点击下面的"新建参赛作品"！ + label_wellmeaning_intimation_contenttwo: 若您已完成开发，且只希望发布您的作品，“托管项目”一项可以不选； + label_wellmeaning_intimation_contentthree: 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹，请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目，若您还没有创建项目，请点击右边的“创建项目”，然后回到本页再选择。 notice_account_updated: 帐号更新成功 notice_attendingcontest_work_successfully_created: 恭喜您，参赛作品创建成功！ notice_softapplication_was_successfully_updated: 恭喜您，参赛作品更新成功！ + + + #end + # ajax异步验证 modal_valid_passing: 可以使用 label_bug: 漏洞 From b13638bb956be1de5bad9ec3a1dc5545cbfad80c Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Sat, 24 May 2014 11:11:11 +0800 Subject: [PATCH 03/46] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?= =?UTF-8?q?=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/softapplications/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/softapplications/_form.html.erb b/app/views/softapplications/_form.html.erb index 4703af9b..fd946cfc 100644 --- a/app/views/softapplications/_form.html.erb +++ b/app/views/softapplications/_form.html.erb @@ -65,7 +65,7 @@
- 上传作品软件包和作品截图 + <%=l(:label_upload_softworkpacket_photo)%> <%= render_flash_messages %>

<%= render :partial => 'attachments/form' %> From be5de6f3f6ce69a70ca597fe8042a59f4b5a08eb Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Sat, 24 May 2014 11:28:14 +0800 Subject: [PATCH 04/46] =?UTF-8?q?zh=E6=96=87=E4=BB=B6=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=BD=E5=AE=B6=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 746e52c2..a1b343a4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1880,8 +1880,14 @@ zh: label_work_name: 作品名称 label_softapplication_description: 应用简介 label_work_description: 作品简介 + label_work_scores: 作品得分 + label_work_rating: 评分 + label_work_tishi: 您可以重新打分，打分结果以最后一次打分为主！ + label_work_scores_proportion: 得分比例 label_softapplication_type: 应用分类 label_work_type: 作品分类 + label_work_photo: 作品截图 + label_work_comment: 作品评论 label_softapplication_version_available: 适配版本 label_running_platform: 运行平台 label_softapplication_developer: 上传人员 @@ -1897,6 +1903,7 @@ zh: label_tags_contest: 竞赛标签 label_tags_contest: 竞赛名称 label_final_scores: 最终得分 + label_rating_person_amount: 打分总人数 label_tags_contest_description: 竞赛描述 label_release_add_contest_succeed: 该应用发布并添加成功. label_add_contest_succeed_fail: 添加失败,该应用已参赛. @@ -1942,6 +1949,15 @@ zh: notice_attendingcontest_work_successfully_created: 恭喜您，参赛作品创建成功！ notice_softapplication_was_successfully_updated: 恭喜您，参赛作品更新成功！ + label_attendingcontestwork_belongs_contest: 所属竞赛 + label_attendingcontestwork_belongs_type: 所属类别 + label_attendingcontestwork_release_person: 发布人员 + label_attendingcontestwork_adaptive_system: 系统支持 + label_attendingcontestwork_download: 作品下载 + label_attendingcontestwork_developers: 开发人员 + label_attendingcontestwork_average_scores: 平均评分 + label_attendingcontestwork_release_time: 发布时间 + label_attendingcontestwork_deposit_project: 托管项目 #end From b416d69639a2256f71a308cf89eab93a006e5c79 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 26 May 2014 11:01:17 +0800 Subject: [PATCH 05/46] vxc --- app/controllers/softapplications_controller.rb | 1 + app/views/welcome/contest.html.erb | 2 +- db/schema.rb | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 31675ca5..6425dad2 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -149,6 +149,7 @@ class SoftapplicationsController < ApplicationController respond_to do |format| if @softapplication.save ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id) + #ProjectingSoftapplication.create(:project_id => params[:project_id], :softapplication_id => @softapplication.id) format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]), notice: l(:notice_attendingcontest_work_successfully_created) } # format.json { render json: @softapplication, status: :created, location: @softapplication } else diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 3e0fecce..c0cbd4f6 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -187,7 +187,7 @@

    <% find_new_forum_topics(11).each do |topic|%> -
  • +
  •       <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %> diff --git a/db/schema.rb b/db/schema.rb index f6c83ac6..ff988912 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140519074133) do +ActiveRecord::Schema.define(:version => 20140522025721) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -28,6 +28,11 @@ ActiveRecord::Schema.define(:version => 20140519074133) do t.datetime "updated_at", :null => false end + create_table "applied_projects", :force => true do |t| + t.integer "project_id", :null => false + t.integer "user_id", :null => false + end + create_table "apply_project_masters", :force => true do |t| t.integer "user_id" t.string "apply_type" From f392fc244fc2579a01516314e0bdc315f4794bea Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Mon, 26 May 2014 11:05:02 +0800 Subject: [PATCH 06/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E5=B8=96=E5=AD=90=E5=90=8E=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E8=BF=9B=E5=85=A5=E6=96=B0=E7=9A=84=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E5=8F=91=E5=B8=83=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/open_source_projects/_show_topics.html.erb | 2 +- app/views/open_source_projects/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 3ba46394..1339227f 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -435,7 +435,7 @@ - + @@ -56,7 +53,7 @@
    -
    作品简介：
    +
    <%=l(:label_work_description)%>：
    <%= @softapplication.description %>
    @@ -64,11 +61,11 @@
    -
    作品得分：
    +
    <%=l(:label_work_scores)%>：
    -
    得分比例
    +
    <%=l(:label_work_scores_proportion)%>
    <% 100.step(20, -20) do |star| %>
    @@ -83,14 +80,12 @@
    -
    最终得分
    -
    <%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %> - 分 -
    +
    <%=l(:label_final_scores)%>
    +
    <%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>分
    <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
    -
    打分总人数
    +
    <%=l(:label_rating_person_amount)%>
    <%= @softapplication.raters(:quality).count %>
    @@ -100,7 +95,7 @@
    -
    作品截图：
    +
    <%=l(:label_work_photo)%>：
    @@ -119,9 +114,9 @@
    -
    作品评论：
    +
    <%=l(:label_work_comment)%>：
    <% if (User.current.logged? and User.current.id != @softapplication.user_id) %> -
    评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> +
    <%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> (您可以重新打分，打分结果以最后一次打分为主！)
    <% end %> diff --git a/db/migrate/20140526104509_add_project_to_softapplication.rb b/db/migrate/20140526104509_add_project_to_softapplication.rb new file mode 100644 index 00000000..f7b6690c --- /dev/null +++ b/db/migrate/20140526104509_add_project_to_softapplication.rb @@ -0,0 +1,5 @@ +class AddProjectToSoftapplication < ActiveRecord::Migration + def change + add_column :softapplications, :project_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 686c5526..68b9ad65 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140526031949) do +ActiveRecord::Schema.define(:version => 20140526104509) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -803,6 +803,7 @@ ActiveRecord::Schema.define(:version => 20140526031949) do t.string "application_developers" t.string "deposit_project_url" t.string "deposit_project" + t.integer "project_id" end create_table "students_for_courses", :force => true do |t| From 4afc41a171517cfec1d2fcb8bb7199a20030ab76 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 26 May 2014 19:46:49 +0800 Subject: [PATCH 11/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=98=E7=AE=A1=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/softapplications_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index d72c0859..b8d81b10 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -173,7 +173,8 @@ class SoftapplicationsController < ApplicationController # @softapplication = Softapplication.find(params[:id]) @softapplication.attachments.map{|attach| attach.destroy } @softapplication.save_attachments(params[:attachments]) - @softapplication.deposit_project = params[:project] + #@softapplication.deposit_project = params[:project] + @softapplication.project = Project.find_by_id(params[:project]) respond_to do |format| if @softapplication.update_attributes(params[:softapplication]) format.html { redirect_to @softapplication, notice: l(:notice_softapplication_was_successfully_updated) } From d20114cc42fa13a62241dd87668c0392d6954b7c Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 26 May 2014 19:51:20 +0800 Subject: [PATCH 12/46] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/softapplications/show.html.erb | 4 ++-- config/locales/zh.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 700a326f..e41ecb84 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -41,7 +41,7 @@
    @@ -117,7 +117,7 @@
    <%=l(:label_work_comment)%>：
    <% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
    <%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> - (您可以重新打分，打分结果以最后一次打分为主！)
    + (<%=l(:label_attendingcontestwork_sorting_intimation)%>) <% end %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a1b343a4..678f6e0a 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1958,6 +1958,7 @@ zh: label_attendingcontestwork_average_scores: 平均评分 label_attendingcontestwork_release_time: 发布时间 label_attendingcontestwork_deposit_project: 托管项目 + label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！ #end From 6dba5aaae64ab6cf09ee09d7a4c6c702624c52a4 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 27 May 2014 08:16:35 +0800 Subject: [PATCH 13/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E4=B8=AD=20=20=E5=9B=9E=E5=A4=8D=EF=BC=8C=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=EF=BC=8C=E6=B5=8F=E8=A7=88=E7=9A=84=E9=93=BE=E6=8E=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/open_source_projects/_show_memo.html.erb | 6 +++--- app/views/open_source_projects/_show_topics.html.erb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 63de4213..05a1fc6c 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -23,7 +23,7 @@ From 06a775e3f96523801585ead15f8ed87d6d4b5e05 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 27 May 2014 16:42:22 +0800 Subject: [PATCH 18/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E5=AD=97=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/open_source_projects/_show_bug.html.erb | 4 ++-- app/views/open_source_projects/_show_memo.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb index 7407c115..97dae682 100644 --- a/app/views/open_source_projects/_show_bug.html.erb +++ b/app/views/open_source_projects/_show_bug.html.erb @@ -2,7 +2,7 @@
    - 共有 <%= link_to memos.count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
    <% if memos.any? %> @@ -59,7 +59,7 @@
    - diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 5fa9cb9d..7d723dca 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -2,7 +2,7 @@
    - 共有 <%= link_to memos.count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
    <% if memos.any? %> From 200c052bb4951abee41cb0791b59d9a4e2cacaac Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 27 May 2014 17:13:56 +0800 Subject: [PATCH 19/46] watchers --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6174e212..32c182fa 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -565,7 +565,7 @@ class UsersController < ApplicationController end def watch_projects - @watch_projects = Project.joins(:watchers).where("project_type <>? and watchable_type = ? and user_id = ?", '1','Project', @user.id) + @watch_projects = Project.joins(:watchers).where("project_type <>? and watchable_type = ? and watchers.user_id = ?", '1','Project', @user.id) @state = 1 respond_to do |format| format.html { From 22d4835d08ed27bfb007c783a331610bdbc2d24c Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 27 May 2014 18:14:30 +0800 Subject: [PATCH 20/46] asset pipeline. gemfile --- Gemfile | 12 ++++++++++++ Gemfile.lock | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Gemfile b/Gemfile index bfc0b773..7ff3df60 100644 --- a/Gemfile +++ b/Gemfile @@ -15,6 +15,18 @@ gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] gem "builder", "3.0.0" gem 'acts-as-taggable-on' +# Gems used only for assets and not required +# in production environments by default. +group :assets do + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + # gem 'therubyracer', :platforms => :ruby + + gem 'uglifier', '>= 1.0.3' +end + # Optional gem for LDAP authentication group :ldap do gem "net-ldap", "~> 0.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 54d89f38..3486c743 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,16 @@ GEM arel (3.0.2) builder (3.0.0) coderay (1.0.9) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.1) erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) fastercsv (1.5.0) hike (1.2.3) i18n (0.6.1) @@ -86,6 +95,11 @@ GEM rdoc (3.12.2) json (~> 1.4) ruby-openid (2.1.8) + sass (3.2.7) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -97,6 +111,9 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) + uglifier (1.0.3) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) PLATFORMS x86-mingw32 @@ -107,6 +124,7 @@ DEPENDENCIES acts-as-taggable-on builder (= 3.0.0) coderay (~> 1.0.6) + coffee-rails (~> 3.2.1) fastercsv (~> 1.5.0) i18n (~> 0.6.0) jquery-rails (~> 2.0.2) @@ -116,4 +134,6 @@ DEPENDENCIES rails (= 3.2.13) rdoc (>= 2.4.2) ruby-openid (~> 2.1.4) + sass-rails (~> 3.2.3) seems_rateable! + uglifier (>= 1.0.3) From c4b292b711ff1883aa5ec0425280dc5ccd667455 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 29 May 2014 09:32:06 +0800 Subject: [PATCH 21/46] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B=E7=9C=9F=E5=90=8D=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 173fc26a..6be2a4d7 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -17,8 +17,13 @@
    <%= link_to h(topic.subject), topic.url %><%= link_to h(topic.subject), topic.url, :target => '_blank' %> diff --git a/app/views/open_source_projects/show.html.erb b/app/views/open_source_projects/show.html.erb index d1751dec..ec9d521d 100644 --- a/app/views/open_source_projects/show.html.erb +++ b/app/views/open_source_projects/show.html.erb @@ -32,7 +32,7 @@ <% #= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %> - <%= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add', + <%#= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add', :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %> From 401f09707907f2e36a3c048d6bdb665b216901bd Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Mon, 26 May 2014 11:18:57 +0800 Subject: [PATCH 07/46] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=B8=96=E5=AD=90=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/open_source_projects/_show_topics.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 1339227f..75feb1d4 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -469,11 +469,11 @@ - + From 4b1d7e049d99a5ce45dc170efc6f4885a88de271 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 26 May 2014 14:27:47 +0800 Subject: [PATCH 08/46] 233 --- config/routes.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index dbbc544a..59ed6c39 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -661,5 +661,4 @@ RedmineApp::Application.routes.draw do end end end - get ':controller(/:action(/:id))' end From 8d77c62359f3b0ca573317619dc00131b4ffe0da Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 26 May 2014 16:37:06 +0800 Subject: [PATCH 09/46] sdfd --- app/controllers/softapplications_controller.rb | 3 ++- .../20140526031949_create_projecting_softapplications.rb | 7 +++++++ db/schema.rb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20140526031949_create_projecting_softapplications.rb diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 6425dad2..586bb509 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -149,7 +149,8 @@ class SoftapplicationsController < ApplicationController respond_to do |format| if @softapplication.save ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id) - #ProjectingSoftapplication.create(:project_id => params[:project_id], :softapplication_id => @softapplication.id) + #ProjectingSoftapplication.create_softapplication_projecting(:project_id => params[:project_id], :softapplication_id => @softapplication.id) + #ProjectingSoftapplication.create_softapplication_projecting(@project.id, softapplication.id) format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]), notice: l(:notice_attendingcontest_work_successfully_created) } # format.json { render json: @softapplication, status: :created, location: @softapplication } else diff --git a/db/migrate/20140526031949_create_projecting_softapplications.rb b/db/migrate/20140526031949_create_projecting_softapplications.rb new file mode 100644 index 00000000..cc739e8b --- /dev/null +++ b/db/migrate/20140526031949_create_projecting_softapplications.rb @@ -0,0 +1,7 @@ +class CreateProjectingSoftapplications < ActiveRecord::Migration + def up + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index ff988912..686c5526 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20140522025721) do +ActiveRecord::Schema.define(:version => 20140526031949) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false From a1083fe900d5fc13a4f70b4b549ba772923cb9d1 Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Mon, 26 May 2014 19:19:11 +0800 Subject: [PATCH 10/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8A=A5500=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softapplications_controller.rb | 5 +- app/helpers/application_helper.rb | 2 +- app/models/softapplication.rb | 3 +- .../contests/show_attendingcontest.html.erb | 531 +++++++++--------- app/views/softapplications/index.html.erb | 10 +- app/views/softapplications/show.html.erb | 45 +- ...26104509_add_project_to_softapplication.rb | 5 + db/schema.rb | 3 +- 8 files changed, 313 insertions(+), 291 deletions(-) create mode 100644 db/migrate/20140526104509_add_project_to_softapplication.rb diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index 586bb509..d72c0859 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -47,7 +47,7 @@ class SoftapplicationsController < ApplicationController def show @softapplication = Softapplication.find(params[:id]) - @project = Project.find_by_identifier(@softapplication.deposit_project) + @project = @softapplication.project # 打分统计 stars_reates = @softapplication. rates(:quality) @@ -142,7 +142,8 @@ class SoftapplicationsController < ApplicationController def create @softapplication = Softapplication.new(params[:softapplication]) @softapplication.user = User.current - @softapplication.deposit_project = params[:project] + #@softapplication.deposit_project = params[:project] + @softapplication.project = Project.find_by_id(params[:project]) @softapplication.save_attachments(params[:attachments]) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 96ea86da..ca946bf7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -745,7 +745,7 @@ module ApplicationHelper tmp = Hash.new tmp={"" => ""} option.each do |project| - tmp[project.name] = project.identifier + tmp[project.name] = project.id end tmp end diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb index 5e1e1bd5..f7eed43f 100644 --- a/app/models/softapplication.rb +++ b/app/models/softapplication.rb @@ -6,10 +6,11 @@ class Softapplication < ActiveRecord::Base has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :contesting_softapplications, :dependent => :destroy - has_many :projecting_softapplications, :dependent => :destroy + #has_many :projecting_softapplications, :dependent => :destroy belongs_to :user belongs_to :project has_many :contests, :through => :contesting_softapplications + belongs_to :project def add_jour(user, notes, reference_user_id = 0, options = {}) if options.count == 0 diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index 017659d7..8a567bd5 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -1,170 +1,177 @@ <%= render_flash_messages %>
    -
    <%= l(:label_wellmeaning_intimation_contentone)%>
    -
    1) <%= l(:label_wellmeaning_intimation_contenttwo)%>
    -
    2) <%= l(:label_wellmeaning_intimation_contentthree)%>
    +
    <%= l(:label_wellmeaning_intimation_contentone) %>
    +
    1) <%= l(:label_wellmeaning_intimation_contenttwo) %>
    +
    2) <%= l(:label_wellmeaning_intimation_contentthree) %>
    <% if User.current.logged? %> -
    -
    - <%= l(:label_attending_contest)%>： - <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %> -
    - - -
    +
    +
    + <%= l(:label_attending_contest) %>： + <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %> +
    +
    <% else %> -
    - <%= l(:label_user_login_attending_contest) %> - <%= link_to l(:label_user_login_new), signin_path %> -
    +
    + <%= l(:label_user_login_attending_contest) %> + <%= link_to l(:label_user_login_new), signin_path %> +
    <% end %>     - <%= l(:label_work_name) %> - * : - (<%= l(:label_workname_lengthlimit)%>) -
    -
    -
    + <%= form_for Softapplication.new, :url => softapplications_path do |f| %> +
    + <%= hidden_field_tag 'contest_id', @contest.id %> +
    + <%= l(:label_work_name) %> + * : + + (<%= l(:label_workname_lengthlimit) %>) + +
    +
    +
    - - <%= l(:label_running_platform) %> - * : + + <%= l(:label_running_platform) %> + * : + -
    -
    -
    + +
    +
    +
    - - <%= l(:label_work_type) %> + + <%= l(:label_work_type) %> - * : + * : + -
    -
    -
    + +
    +
    +
    - - <%= l(:label_work_description) %> - * : - (<%= l(:label_workdescription_lengthlimit)%>) -
    -
    -
    + + <%= l(:label_work_description) %> + * : + + (<%= l(:label_workdescription_lengthlimit) %>) + +
    +
    +
    - - <%= l(:label_softapplication_developers) %> - * : + + <%= l(:label_softapplication_developers) %> + * : + -
    -
    -
    - - - <%= l(:label_work_deposit_project) %>： - <%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %> - <%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target=>'_blank'%> -
    -
    -
    + +
    +
    +
    -
    - - <%= l(:label_upload_softworkpacket_photo)%> - - <%#= render_flash_messages %> -

    - <%= render :partial => 'attachments/form' %> -

    -

    - 1、<%= l(:label_upload_softapplication_packets_mustpacketed)%>
    -
    - 2、<%= l(:label_upload_softapplication_photo_condition)%> -

    +
    + <%= l(:label_work_deposit_project) %>： + <%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %> + <%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target => '_blank' %> + +
    +
    +
    - -
    -
    - <%= submit_tag l(:button_create) %> - <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", - :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", - :onmouseover => "this.style.backgroundPosition = 'left -30px'" %> -
    - <% end %> +
    + + <%= l(:label_upload_softworkpacket_photo) %> + + <%#= render_flash_messages %> +

    + <%= render :partial => 'attachments/form' %> +

    + +

    + 1、<%= l(:label_upload_softapplication_packets_mustpacketed) %>
    +
    + 2、<%= l(:label_upload_softapplication_photo_condition) %> +

    + +
    +
    +
    + <%= submit_tag l(:button_create) %> + <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", + :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'", + :onmouseover => "this.style.backgroundPosition = 'left -30px'" %> +
    + <% end %> @@ -176,173 +183,185 @@ <% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> -<% @contesting_project.sort.reverse.each do |c_project|%> -<% if c_project.project %> -
    -
    -
    -
    <%= l(:label_contest_work)%>: <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> -
    -
    - - - <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> - + + + <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> + - <% end %> - - -
    - -
    -
    - - -
    - -
    - <%= l(:label_attendingcontest_time)%>：<%= format_time c_project.created_at%> - <%= l(:label_attendingcontest_spoksman)%>：<%= c_project.user.name %> -
    + + + <% end %> + + + +
    + +
    +
    + + + +
    + +
    + <%= l(:label_attendingcontest_time) %> + ：<%= format_time c_project.created_at %> + <%= l(:label_attendingcontest_spoksman) %> + ：<%= c_project.user.name %> +
    -
    +
    -
    -
    -<% end %> -
    -<% end %> + + + <% end %> +
    + <% end %> <% else %> -<% @contesting_softapplication.each do |c_softapplication|%> -<% if c_softapplication.softapplication %> -
    -
    -
    - - -
    - - -
    -
    - - -
    - - -
    - <%= l(:label_attendingcontest_time)%>：<%= format_time c_softapplication.created_at %> - <%= l(:label_attendingcontest_spoksman)%>：<%= c_softapplication.softapplication.user.name %> -
    - - -
    - <%= l(:label_final_scores)%>：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分 + <% @contesting_softapplication.each do |c_softapplication| %> + <% if c_softapplication.softapplication %> +
    +
    +
    + + + +
    + + +
    +
    + + + +
    + + +
    + <%= l(:label_attendingcontest_time) %> + ：<%= format_time c_softapplication.created_at %> + <%= l(:label_attendingcontest_spoksman) %> + ：<%= c_softapplication.softapplication.user.name %> +
    + + +
    + <%= l(:label_final_scores) %> + ：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %> + 分
    + + - <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> -
    + <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> +
    <%= toggle_link '评奖', c_softapplication.id.to_s %> -
    + +
    <% end %> - - - -<% end %> -
    -<% end %> + + + + <% end %> +
    + <% end %> <% end %> diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb index 841a8a20..5b355f65 100644 --- a/app/views/softapplications/index.html.erb +++ b/app/views/softapplications/index.html.erb @@ -16,13 +16,13 @@
    <%= softapplication.description.truncate(95, omission: '...') %>
    <%contest = softapplication.contests.first%> -

    所属竞赛：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>

    -

    所属类别：<%= softapplication.app_type_name.truncate(10, omission: '...') %>

    -

    系统支持：<%= softapplication.android_min_version_available %>

    +

    <%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>

    +

    <%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(10, omission: '...') %>

    +

    <%=l(:label_attendingcontestwork_adaptive_system)%>：<%= softapplication.android_min_version_available %>

    - 开发人员：<%= softapplication.application_developers %> - 发布时间：<%=format_time softapplication.created_at %> + <%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %> + <%=l(:label_attendingcontestwork_release_time)%>：<%=format_time softapplication.created_at %>
    diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 8b9b3260..700a326f 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -16,38 +16,35 @@ - + <% contest = @softapplication.contests.first %> - + - - + + - + - - + + - -
    帖子来源：<%=link_to 'OSChina', topic.url %>
    <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %><%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %>
    <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %>
    - - - <% if get_prize(c_project).nil? or get_prize(c_project) == "" %> + <% @contesting_project.sort.reverse.each do |c_project| %> + <% if c_project.project %> +
    +
    +
    +
    <%= l(:label_contest_work) %> + : <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> + +
    +
    		+ + + <% if get_prize(c_project).nil? or get_prize(c_project) == "" %> <% if @contest.deadline < Date.today %> - <%= l(:label_noawards)%> - <% else%> - <%= l(:label_noawards_current)%> + <%= l(:label_noawards) %> + <% else %> + <%= l(:label_noawards_current) %> <% end %> <% else %> - <% case get_prize(c_project) %> + <% case get_prize(c_project) %> <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png")%> + <%= image_tag("/images/bid/special_reward.png") %> <% when '0' %> - <%= image_tag("/images/bid/first_reward.png")%> + <%= image_tag("/images/bid/first_reward.png") %> <% when '1' %> - <%= image_tag("/images/bid/second_reward.png")%> + <%= image_tag("/images/bid/second_reward.png") %> <% when '2' %> - <%= image_tag("/images/bid/third_reward.png")%> + <%= image_tag("/images/bid/third_reward.png") %> <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png")%> + <%= image_tag("/images/bid/forth_reward.png") %> <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png")%> + <%= image_tag("/images/bid/fifth_reward.png") %> <% when '5' %> - <%= image_tag("/images/bid/qualified.png")%> + <%= image_tag("/images/bid/qualified.png") %> <% end %> <% end %> - - - <%= toggle_link l(:label_reward), c_project.id.to_s %> - - + <%= toggle_link l(:label_reward), c_project.id.to_s %> + + -
    <%= l(:label_profile)%>: <%= c_project.project.description.truncate(90, omission: '...') %>
    <%= l(:label_profile) %>: <%= c_project.project.description.truncate(90, omission: '...') %>
    <%= l(:label_contest_work)%>: <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %>
    <%= l(:label_profile)%>: <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
    <%= l(:label_contest_work) %>: <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %>
    <%= l(:label_profile) %>: <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
    - - - <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %> + + + <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %> <% if @contest.deadline < Date.today %> - <%= l(:label_noawards)%> - <% else%> - <%= l(:label_noawards_current)%> + <%= l(:label_noawards) %> + <% else %> + <%= l(:label_noawards_current) %> <% end %> <% else %> - <% case get_prize(c_softapplication) %> + <% case get_prize(c_softapplication) %> <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png")%> + <%= image_tag("/images/bid/special_reward.png") %> <% when '0' %> - <%= image_tag("/images/bid/first_reward.png")%> + <%= image_tag("/images/bid/first_reward.png") %> <% when '1' %> - <%= image_tag("/images/bid/second_reward.png")%> + <%= image_tag("/images/bid/second_reward.png") %> <% when '2' %> - <%= image_tag("/images/bid/third_reward.png")%> + <%= image_tag("/images/bid/third_reward.png") %> <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png")%> + <%= image_tag("/images/bid/forth_reward.png") %> <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png")%> + <%= image_tag("/images/bid/fifth_reward.png") %> <% when '5' %> - <%= image_tag("/images/bid/qualified.png")%> + <%= image_tag("/images/bid/qualified.png") %> <% end %> <% end %> - -
    所属类别：<%= @softapplication.app_type_name %><%=l(:label_attendingcontestwork_belongs_type)%>：<%= @softapplication.app_type_name %>所属竞赛：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %>
    发布人员：<%= @softapplication.user.name %>系统支持：<%= @softapplication.android_min_version_available %><%=l(:label_attendingcontestwork_release_person)%>：<%= @softapplication.user.name %><%=l(:label_attendingcontestwork_adaptive_system)%>：<%= @softapplication.android_min_version_available %>
    - 作品下载： + <%=l(:label_attendingcontestwork_download)%>： <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> 开发人员：<%= @softapplication.application_developers %><%=l(:label_attendingcontestwork_developers)%>：<%= @softapplication.application_developers %>
    平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>发布时间：<%=format_time @softapplication.created_at %><%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %><%=l(:label_attendingcontestwork_release_time)%>：<%=format_time @softapplication.created_at %>
    - <% if (@softapplication.deposit_project != "nil" && @softapplication.deposit_project != "") %> - <%#= textilizable ("托管项目： " + @project.name) %> - 托管项目：<%= link_to "#@project", project_path(@project.id) %> - <% end %> + <% if @project %> + 托管项目：<%= link_to "#@project", project_path(@project) %> + <% end %>
    <% if @project %> - 托管项目：<%= link_to "#@project", project_path(@project) %> + <%=l(:label_attendingcontestwork_deposit_project)%>：<%= link_to "#@project", project_path(@project) %> <% end %>
    - + @@ -33,7 +33,7 @@ - + - - - +
    <%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.replies_count), topic.url, :target => '_blank' %>
    回帖 - + @@ -43,7 +43,7 @@ - + - - - + diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 1a004133..dacc9b01 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -467,17 +467,17 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    关注 - + diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index 75feb1d4..ebfe9cd1 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -439,7 +439,7 @@ diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 05a1fc6c..5fa9cb9d 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -51,17 +51,17 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    浏览 - + @@ -449,7 +449,7 @@ - + - - - + - -
    <%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.replies_count), topic.url, :target => '_blank' %>
    回帖 - + @@ -459,7 +459,7 @@
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    关注 - + From 98444ef01e0e879dee287f018fe9f04125f19915 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 27 May 2014 08:32:43 +0800 Subject: [PATCH 14/46] remove fuzzy routes|add school missing row --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 59ed6c39..2c786521 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -623,6 +623,10 @@ RedmineApp::Application.routes.draw do ######################## ##added by wen########## #######confusing######## + get 'welcome/search', to: 'welcome#search' + get 'school/index', to: 'school#index' + get 'course/:school_id', to: 'welcome#course' + get 'course/:school_id', to: 'welcome#course' post 'school/get_options/:province', :to => 'school#get_options' get 'school/get_options/:province', :to => 'school#get_options' From a9b88b8e664ef243db8f7077f640bf4588e06723 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 27 May 2014 08:51:03 +0800 Subject: [PATCH 15/46] issues#show words typo --- app/helpers/issues_helper.rb | 9 ++++----- app/models/issue.rb | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 23351d91..5e7f7c18 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -59,12 +59,11 @@ module IssuesHelper def issue_heading(issue) #h("#{issue.tracker} ##{issue.id}") - #h("#{issue.tracker} #{issue.source_from}") + # h("#{issue.tracker} #{issue.source_from}") s = '' - s << ">>" - s << link_to(@issue.project.name+l(:issue_list), project_issues_path(@issue.project)) - s << " >" - s << @issue.source_from + s << link_to(@issue.project.name, project_issues_path(@issue.project)) + s << " > #" + s << @issue.project_index s.html_safe end diff --git a/app/models/issue.rb b/app/models/issue.rb index d2332350..7e899eaf 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1156,7 +1156,11 @@ class Issue < ActiveRecord::Base # back string obj which is belong to project. def source_from "" << self.project.name.to_s << - "#" << (self.project.issues.index(self).to_i + 1).to_s + "#" << project_index + end + + def project_index + (self.project.issues.index(self).to_i + 1).to_s end private From fdf8b5640a6f9deae30e916b0e9e2d9a249bafcf Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 27 May 2014 09:01:36 +0800 Subject: [PATCH 16/46] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open_source_projects_controller.rb | 105 +++++++++++------- .../open_source_projects/_show_bug.html.erb | 82 ++++++++++++++ .../_show_topics.html.erb | 2 +- .../open_source_projects/showbug.html.erb | 55 +++++++++ config/routes.rb | 31 +++--- 5 files changed, 218 insertions(+), 57 deletions(-) create mode 100644 app/views/open_source_projects/_show_bug.html.erb create mode 100644 app/views/open_source_projects/showbug.html.erb diff --git a/app/controllers/open_source_projects_controller.rb b/app/controllers/open_source_projects_controller.rb index 1ca7ddce..7b933364 100644 --- a/app/controllers/open_source_projects_controller.rb +++ b/app/controllers/open_source_projects_controller.rb @@ -1,8 +1,8 @@ class OpenSourceProjectsController < ApplicationController - + before_filter :find_osp, :only => [:master_apply, :accept_master_apply, :refuse_master_apply] before_filter :require_master, :only => [:master_apply, :accept_master_apply, :refuse_master_apply] - + helper :sort include SortHelper helper :apply_project_masters @@ -22,7 +22,7 @@ class OpenSourceProjectsController < ApplicationController @os_project_count = @open_source_projects.count @os_project_pages = Paginator.new @os_project_count, per_page_option, params['page'] - + @open_source_projects = @open_source_projects.offset(@os_project_pages.offset).limit(@os_project_pages.per_page) # @open_source_projects = OpenSourceProject.all @@ -32,11 +32,11 @@ class OpenSourceProjectsController < ApplicationController format.json { render json: @open_source_projects } end end - + def master_apply @apply = @open_source_project.apply_tips @applicants = @open_source_project.applicants - + respond_to do |format| format.html { render :layout => "base_opensource_p" @@ -49,7 +49,7 @@ class OpenSourceProjectsController < ApplicationController # GET /open_source_projects/1.json def show @open_source_project = OpenSourceProject.find(params[:id]) - + sort_init 'updated_at', 'desc' sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at", 'replies' => "#{RelativeMemo.table_name}.replies_count", @@ -63,9 +63,9 @@ class OpenSourceProjectsController < ApplicationController includes(:last_reply). limit(@topic_pages.per_page). offset(@topic_pages.offset). - order(sort_clause). + order(sort_clause). all - + @bugs = @open_source_project.bugs.limit(6) respond_to do |format| @@ -76,25 +76,22 @@ class OpenSourceProjectsController < ApplicationController end end + def search -def search - end + def showbug + @open_source_project = OpenSourceProject.find(params[:id]) -# added by yiang 暴力添加,请绕道 -def showmemo - @open_source_project = OpenSourceProject.find(params[:id]) - - sort_init 'updated_at', 'desc' - sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at", + sort_init 'updated_at', 'desc' + sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at", 'replies' => "#{RelativeMemo.table_name}.replies_count", 'updated_at' => "COALESCE (last_replies_relative_memos.created_at, #{RelativeMemo.table_name}.created_at)" - @memo = RelativeMemo.new(:open_source_project => @open_source_project) - @topic_count = @open_source_project.topics.count - @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] - @memos = @open_source_project.topics. + @memo = RelativeMemo.new(:open_source_project => @open_source_project) + @topic_count = @open_source_project.bugs.count + @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] + @memos = @open_source_project.bugs. reorder("#{RelativeMemo.table_name}.sticky DESC"). includes(:last_reply). limit(@topic_pages.per_page). @@ -102,13 +99,42 @@ def showmemo order(sort_clause). all - respond_to do |format| - format.html { - render :layout => "base_opensource_p" - } - format.json { render json: @open_source_project } + respond_to do |format| + format.html { + render :layout => "base_opensource_p" + } + format.json { render json: @open_source_project } + end end -end + + # added by yiang 暴力添加,请绕道 + def showmemo + @open_source_project = OpenSourceProject.find(params[:id]) + + sort_init 'updated_at', 'desc' + sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at", + 'replies' => "#{RelativeMemo.table_name}.replies_count", + 'updated_at' => "COALESCE (last_replies_relative_memos.created_at, #{RelativeMemo.table_name}.created_at)" + + @memo = RelativeMemo.new(:open_source_project => @open_source_project) + @topic_count = @open_source_project.topics.count + @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] + @memos = @open_source_project.topics. + reorder("#{RelativeMemo.table_name}.sticky DESC"). + includes(:last_reply). + limit(@topic_pages.per_page). + offset(@topic_pages.offset). + order(sort_clause). + all + + respond_to do |format| + format.html { + render :layout => "base_opensource_p" + } + format.json { render json: @open_source_project } + end + end + # GET /open_source_projects/new # GET /open_source_projects/new.json def new @@ -168,52 +194,51 @@ end format.json { head :no_content } end end - + def remove_condition @app_dir = params[:app_dir] @language = params[:language] @created_at = params[:created_at] redirect_to open_source_projects_path(:app_dir => @app_dir, :language => @language, :created_at => @created_at, :name => params[:name]) end - + def search # per_page_option = 10 -# + # # @open_source_projects = OpenSourceProject.filter(@app_dir, @language, @created_at) # @open_source_projects = @open_source_projects.like(params[:name]) if params[:name].present? -# + # # @os_project_count = @open_source_projects.count # @os_project_pages = Paginator.new @os_project_count, per_page_option, params['page'] -# + # # @open_source_projects = @open_source_projects.offset(@os_project_pages.offset).limit(@os_project_pages.per_page) redirect_to open_source_projects_path(:name => params[:name]) end - + def refuse_master_apply @apply = ApplyProjectMaster.where("user_id = ? and apply_id = ? and apply_type = 'OpenSourceProject'", params[:user_id], @open_source_project.id) @apply.first.destory - + redirect_to master_apply_open_source_project_path end - + def accept_master_apply @apply = ApplyProjectMaster.where("user_id = ? and apply_id = ? and apply_type = 'OpenSourceProject'", params[:user_id], @open_source_project.id) if @apply.count == 1 - @apply.first.update_attributes(:status => 2) + @apply.first.update_attributes(:status => 2) end - + redirect_to master_apply_open_source_project_path end - - + private - + def require_master render_403 unless @open_source_project.admin?(User.current) end - + def find_osp @open_source_project = OpenSourceProject.find(params[:id]) render_404 unless @open_source_project.present? diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb new file mode 100644 index 00000000..05a1fc6c --- /dev/null +++ b/app/views/open_source_projects/_show_bug.html.erb @@ -0,0 +1,82 @@ + + + +
    + 共有 <%= link_to memos.count %> 个贴子 +
    + <% if memos.any? %> + <% memos.each do |topic| %> +
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    浏览
    + + + + + +
    <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%> + <%= image_tag('../images/avatars/User/0', :class => "avatar") unless topic.author%> + + + + + + + + + + + + + + + + + + + + + +
    + <% if topic.url.nil? || topic.url == '' %> + <%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %> + <% else %> + <%= link_to h(topic.subject), topic.url %> + <% end %> + + + + + + + +
    <%= link_to (topic.replies_count), topic.url, :target => '_blank' %>
    回帖
    		 + + + + + + + +
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    关注
    		 + + + + + + + +
    <%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), topic.url, :target => '_blank' %>
    浏览
    <%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %> +
    +
    帖子来源：<%=link_to 'OSChina', topic.url %> + <%= no_use_link(topic, User.current) %>
    + + <% end %> + + <% else %> +

    + <%= l(:label_no_data) %> +

    + <% end %> + \ No newline at end of file diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index ebfe9cd1..1a004133 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -20,7 +20,7 @@
    -

    项目安全态势

    <%= link_to "更多 >>", :controller => "open_source_projects",:action => "showmemo", :id => @open_source_project.id %>
    +

    项目安全态势

    <%= link_to "更多 >>", :controller => "open_source_projects",:action => "showbug", :id => @open_source_project.id %>
      diff --git a/app/views/open_source_projects/showbug.html.erb b/app/views/open_source_projects/showbug.html.erb new file mode 100644 index 00000000..86e8a226 --- /dev/null +++ b/app/views/open_source_projects/showbug.html.erb @@ -0,0 +1,55 @@ + + + +<% #= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %> + + <%= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %> + + +
      + <%#= link_to( + image_tag('edit.png')+l(:label_forum_edit), + {:action => 'edit', :id => @forum}, + :method => 'get', + :title => l(:button_edit) + ) if @forum.editable_by?(User.current) %> + <%#= link_to( + image_tag('delete.png')+'删除讨论区', + {:action => 'destroy', :id => @forum}, + :method => :delete, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if @forum.destroyable_by?(User.current) %> +
      +<%= render :partial => 'open_source_projects/show_bug', :locals => {:memos => @memos, :open_source_project => @open_source_project} %> +
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2c786521..16132cb6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,11 +18,10 @@ RedmineApp::Application.routes.draw do resources :homework_users - resources :no_uses delete 'no_uses', :to => 'no_uses#delete' - resources :apply_project_masters + resources :apply_project_masters delete 'apply_project_masters', :to => 'apply_project_masters#delete' resources :homework_attach do @@ -42,11 +41,12 @@ RedmineApp::Application.routes.draw do match 'master_apply', via: [:get, :post] match 'accept_master_apply', via: [:get, :post] match 'refuse_master_apply', via: [:get, :post] + match 'showmemo', via: [:get, :post] + match 'showbug', via: [:get, :post] end end mount SeemsRateable::Engine => '/rateable', :as => :rateable - namespace :zipdown do match 'assort' end @@ -56,11 +56,11 @@ RedmineApp::Application.routes.draw do end ##new added by linchun #以发布应用的形式参与竞赛 resources :softapplications do - + collection do match 'new_message', via: :get end - member do + member do match 'create_message' , via: :post end end @@ -89,9 +89,9 @@ RedmineApp::Application.routes.draw do match 'add_softapplication' , via: [:get, :post] match 'create' , via: :post match 'settings' , via: [:get, :post] - end - end - + end + end + resources :stores do collection do match 'search', via: [:get, :post] @@ -321,7 +321,7 @@ RedmineApp::Application.routes.draw do resources :files, :only => [:index, :new, :create] do collection do match "getattachtype" , via: [:get, :post] - #match 'getattachtype/:attachtype', :to => 'files#getattachtype', via: [:get, :post] + #match 'getattachtype/:attachtype', :to => 'files#getattachtype', via: [:get, :post] end end @@ -480,8 +480,8 @@ RedmineApp::Application.routes.draw do collection do match "updateType" , via: [:get, :post] match "renderTag" , via: [:get, :post] - end - end + end + end resources :groups do member do @@ -619,7 +619,6 @@ RedmineApp::Application.routes.draw do match 'calls/:id', :controller => 'bids', :action => 'show', :as => 'respond' match 'contest', :controller => 'bids', :action => 'contests', :as => 'contest' #modified @20140403 - ######################## ##added by wen########## #######confusing######## @@ -632,15 +631,15 @@ RedmineApp::Application.routes.draw do post 'school/get_province', :to => 'school#get_province' get 'school/get_province', :to => 'school#get_province' - + post 'school/get_schoollist/:province', :to => 'school#get_schoollist' get 'school/get_schoollist/:province', :to => 'school#get_schoollist' - + post 'school/search_school/', :to => 'school#search_school' get 'school/search_school/', :to => 'school#search_school' - + post 'school/upload', :to => 'school#upload' - + ######added by nie match 'tags/show_projects_tags',:to => 'tags#show_projects_tags' ########### added by liuping From 4c3e2376f0fba97865e8151a0e453a434a10b262 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Tue, 27 May 2014 16:25:43 +0800 Subject: [PATCH 17/46] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/relative_memo.rb | 5 +++++ app/views/open_source_projects/_show_bug.html.erb | 10 ++++------ app/views/open_source_projects/_show_memo.html.erb | 8 ++++---- app/views/open_source_projects/_show_topics.html.erb | 8 ++++---- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/models/relative_memo.rb b/app/models/relative_memo.rb index 073d1ca1..f087fce2 100644 --- a/app/models/relative_memo.rb +++ b/app/models/relative_memo.rb @@ -70,6 +70,11 @@ class RelativeMemo < ActiveRecord::Base def cannot_reply_to_locked_topic errors.add :base, l(:label_memo_locked) if root.locked? && self != root end + + def short_content(length = 25) + str = "^(.{,#{length}})[^\n\r]*.*$" + content.gsub(Regexp.new(str), '\1...').strip if content + end # def update_memos_forum # if forum_id_changed? diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb index 05a1fc6c..7407c115 100644 --- a/app/views/open_source_projects/_show_bug.html.erb +++ b/app/views/open_source_projects/_show_bug.html.erb @@ -51,20 +51,18 @@
    <%= topic.short_content(70) %>
    <%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %> + <%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %>
    帖子来源：<%=link_to 'OSChina', topic.url %> + 帖子来源：<%=link_to 'OSChina', topic.url %> <%= no_use_link(topic, User.current) %> <%= no_use_link(topic, User.current) %>
    <%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %> + <%= user_url_and_time topic.username, topic.userhomeurl, topic.created_at %>
    帖子来源：<%=link_to 'OSChina', topic.url %> + 帖子来源：<%=link_to 'OSChina', topic.url %> <%= no_use_link(topic, User.current) %> <%= no_use_link(topic, User.current) %>
    <%=user_url_and_time topic.username, topic.userhomeurl, topic.created_at %> + <%=user_url_and_time topic.username, topic.userhomeurl, topic.created_at %>
    帖子来源：<%=link_to 'OSChina', topic.url %> + 帖子来源：<%=link_to 'OSChina', topic.url %> <%= no_use_link(topic, User.current) %> <%= no_use_link(topic, User.current) %>
    帖子来源：<%=link_to 'OSChina', topic.url %> + 帖子来源：<%=link_to topic.topic_resource, topic.url %> <%= no_use_link(topic, User.current) %>
    <%= h(e.project) if @project.nil? || @project.id != e.project.id %> - - <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>(<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>) + + <% if @canShowRealName %> + <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>(<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>) + <% else %> + <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> + <% end %> + <%= l(:label_new_activity) %> <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %> From 4b1212f27952e1bb6307bc093e681bd93904629d Mon Sep 17 00:00:00 2001 From: ganyiang Date: Thu, 29 May 2014 09:55:22 +0800 Subject: [PATCH 22/46] =?UTF-8?q?=E4=BF=AE=E6=AD=A3OSP=E5=9C=A8rubymine?= =?UTF-8?q?=E4=B8=8B=E6=8A=A5=E7=BA=A2=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E5=88=A0=E6=8E=89=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open_source_projects/_show_bug.html.erb | 2 +- .../open_source_projects/_show_memo.html.erb | 2 +- .../_show_topics.html.erb | 88 +++---------------- app/views/open_source_projects/index.html.erb | 16 ++-- 4 files changed, 19 insertions(+), 89 deletions(-) diff --git a/app/views/open_source_projects/_show_bug.html.erb b/app/views/open_source_projects/_show_bug.html.erb index 97dae682..67820981 100644 --- a/app/views/open_source_projects/_show_bug.html.erb +++ b/app/views/open_source_projects/_show_bug.html.erb @@ -2,7 +2,7 @@
    - 共有 <%= link_to @topic_count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
    <% if memos.any? %> diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb index 7d723dca..616ff9bf 100644 --- a/app/views/open_source_projects/_show_memo.html.erb +++ b/app/views/open_source_projects/_show_memo.html.erb @@ -2,7 +2,7 @@
    - 共有 <%= link_to @topic_count %> 个贴子 共有 <%= link_to @topic_count %> 个贴子
    <% if memos.any? %> diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb index dacc9b01..1a16f528 100644 --- a/app/views/open_source_projects/_show_topics.html.erb +++ b/app/views/open_source_projects/_show_topics.html.erb @@ -5,12 +5,13 @@ - + <%= javascript_include_tag "ichart.1.2.min" %> <%= stylesheet_link_tag "sec-analysis.css" %> <%= stylesheet_link_tag "buglist-ichart.css" %> <%= stylesheet_link_tag "buglist.css" %> +
    @@ -27,26 +28,6 @@ <% @bugs.each do |bug| %>
  • >[<%= show_description(bug, open_source_project) %>]<%= link_to bug.subject, bug.url %>
    • <% end %> - - - - - - - - - - - - - - - - - - - -
    @@ -61,8 +42,6 @@ // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10); } - - var data = [ { name :'', @@ -127,7 +106,7 @@ parseText:function(tip,name,value,text,i){ return name+"漏洞数:"+value; } - } , + } }, tipMocker:function(tips,i){ @@ -143,18 +122,7 @@ labels[index]+" "+//日期 ((i%12)==0?"1 月":((i%12+1))+"月")+ //时间 "
    "+tips.join("
    "); - }, - - // legend : { - // enable : true, - // row:1,//设置在一行上显示，与column配合使用 - // column : 'max', - // valign:'top', - // sign:'bar', - // background_color:null,//设置透明背景 - // offsetx:-80,//设置x轴偏移，满足位置需要 - // border : true - // }, + }, crosshair:{ enable:true, //十字交叉线 line_color:'#62bce9' @@ -194,8 +162,7 @@ start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', - // label : {color:'#ffffff',fontsize:11}, + scale_color:'#9f9f9f' },{ position:'bottom', @@ -203,31 +170,7 @@ }] } }); - //开始画图 - /** -*自定义组件,画平均线。 -*/ -// line.plugin(new iChart.Custom({ -// drawFn:function(){ -// /** -// *计算平均值的高度(坐标Y值) -// *计算高度还不会！ 会划线了！ -// */ -// // var avg = line.total/5, -// // coo = line.getCoordinate(), -// // x = coo.get('originx'), -// // W = coo.width, -// // S = coo.getScale('left'), -// // H = coo.height, -// // h = (avg - S.start) * H / S.distance, -// // y = line.y + H - h; -// line.target.line(28,97,400,97,2,'#b32c0d') -// .textAlign('start') -// .textBaseline('middle') -// .textFont('600 12px Verdana'); -// } -// })); line.draw(); }); @@ -282,10 +225,7 @@ // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10); } - - - - var data = [ + var data = [ { name : '', value:flow, @@ -297,16 +237,9 @@ //创建x轴标签文本 var date = new Date() - var labels = []; - /* labels.push(date.getFullYear()-2); - labels.push(date.getFullYear()-1); - labels.push(date.getFullYear()); - labels.push(date.getFullYear()+1);*/ labels=["2012","","","","","","","","","","","","2013","","","","","","","","","","","","2014","","","",""]; - - var line = new iChart.LineBasic2D({ render : 'canvasDiv2', data: data, @@ -352,7 +285,7 @@ parseText:function(tip,name,value,text,i){ return name+"帖子数:"+value+"万"; } - } , + } }, tipMocker:function(tips,i){ @@ -378,10 +311,9 @@ label:false, //是否显示数值 // hollow_inside:false, smooth : true,//平滑曲线 - point_size:2, // 焦点大小 + point_size:2 // 焦点大小 // point_hollow : true, - - + }, coordinate:{ width:225, // 图表大小 @@ -404,7 +336,7 @@ start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', + scale_color:'#9f9f9f' // label : {color:'#ffffff',fontsize:11}, },{ diff --git a/app/views/open_source_projects/index.html.erb b/app/views/open_source_projects/index.html.erb index e51ef4fc..45ac4fa9 100644 --- a/app/views/open_source_projects/index.html.erb +++ b/app/views/open_source_projects/index.html.erb @@ -48,7 +48,7 @@ background-position: -266px 3px; } .navigation .icon-search, .navigation .nav-pill-cancle, .navigation .nav-switch-icon, .navigation .nav-topbar .topbar-search .topbar-submit, .navigation .nav-topbar-arror { - background: url(); + /*background: url()*/ } .nav-switch-icon { width: 15px; @@ -129,8 +129,6 @@ li { .nav-search-con{ padding-top: 7px; } - - <%= javascript_include_tag "ichart.1.2.min" %> <%= stylesheet_link_tag "buglist-div-use.css" %> @@ -146,7 +144,7 @@ li {
    -

    软件安全漏洞

    More >>
    +

    软件安全漏洞

    More >>
      @@ -158,7 +156,7 @@ li { - +
    • [SQL注入漏洞]Apache/NGINX 下 PHP-FPM 拒绝服务漏洞
      • @@ -236,7 +234,7 @@ li { parseText:function(tip,name,value,text,i){ return name+"漏洞数:"+value; } - } , + } }, tipMocker:function(tips,i){ var index; @@ -272,7 +270,7 @@ li { label:false, //是否显示数值 // hollow_inside:false, smooth : true,//平滑曲线 - point_size:2, // 焦点大小 + point_size:2 // 焦点大小 // point_hollow : true, @@ -298,7 +296,7 @@ li { start_scale:0, scale_space:50, end_scale:70, - scale_color:'#9f9f9f', + scale_color:'#9f9f9f' // label : {color:'#ffffff',fontsize:11}, },{ @@ -417,7 +415,7 @@ line.target.line(28,97,400,97,2,'#b32c0d')
    -

    +

    From 866ae3a38d6e6e9667942fa5e627736d1d263f89 Mon Sep 17 00:00:00 2001 From: z9hang Date: Thu, 29 May 2014 18:04:21 +0800 Subject: [PATCH 23/46] =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index e0ad5429..8ecd58eb 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -57,6 +57,7 @@ class Mailer < ActionMailer::Base #如果是直接留言并且留言对象是Project并且Project类型是课程 if !journals_for_message.at_user && journals_for_message.jour.class.to_s.to_sym == :Project && journals_for_message.jour.project_type == 1 project = journals_for_message.jour + @author = journals_for_message.user #课程的教师 @teachers = searchTeacherAndAssistant journals_for_message.jour #收件人邮箱 @@ -440,10 +441,7 @@ class Mailer < ActionMailer::Base headers[:to].delete(@author.mail) if headers[:to].is_a?(Array) headers[:cc].delete(@author.mail) if headers[:cc].is_a?(Array) end - if !User.current.nil? - #不给本人发邮件 - headers[:to].delete(User.current.mail) if headers[:to].is_a?(Array) - end + if @author && @author.logged? redmine_headers 'Sender' => @author.login end From 006e4ae45e731ef3113234df6f4443ebb067b159 Mon Sep 17 00:00:00 2001 From: yanxd Date: Thu, 29 May 2014 18:34:34 +0800 Subject: [PATCH 24/46] user tab bar --- app/helpers/users_helper.rb | 44 ++++++++++--------- .../users/_course_list_have_entity.html.erb | 2 +- app/views/users/_my_joinedcourse.html.erb | 2 +- app/views/users/show.html.erb | 26 ++++++++++- app/views/users/user_projects.html.erb | 17 ++++++- app/views/users/watch_projects.html.erb | 22 +++++++++- public/stylesheets/nyan.css | 18 ++++---- 7 files changed, 93 insertions(+), 38 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index f412e0c8..87b495f0 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -69,28 +69,30 @@ module UsersHelper #
  • <%= link_to("所有反馈", {:controller => 'users', :action => 'show', :type => 2}) %>
    • #
    - def show_activity(state) - content = ''.html_safe - case state - when 0 - s = content_tag('span', l(:label_user_all_activity), :class => "current-page") - content << content_tag('li', s) - content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1})) - content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2})) - when 1 - s = content_tag('span', l(:label_user_activity_myself), :class => "current-page") - content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'})) - content << content_tag('li', s, :class => "current-page") - content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2})) - when 2 - s = content_tag('span', l(:label_user_all_respond), :class => "current-page") - content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'})) - content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1})) - content << content_tag('li', s, :class => "current-page") - end - content_tag('div', content, :class => "pagination") - end + # TODO: 待删 + # def show_activity(state) + # content = ''.html_safe + # case state + # when 0 + # s = content_tag('span', l(:label_user_all_activity), :class => "current-page") + # content << content_tag('li', s) + # content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1})) + # content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2})) + # when 1 + # s = content_tag('span', l(:label_user_activity_myself), :class => "current-page") + # content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'})) + # content << content_tag('li', s, :class => "current-page") + # content << content_tag('li', link_to(l(:label_user_all_respond), {:controller => 'users', :action => 'show', :type => 2})) + # when 2 + # s = content_tag('span', l(:label_user_all_respond), :class => "current-page") + # content << content_tag('li', link_to(l(:label_user_all_activity), {:controller => 'users', :action => 'show'})) + # content << content_tag('li', link_to(l(:label_user_activity_myself), {:controller => 'users', :action => 'show', :type => 1})) + # content << content_tag('li', s, :class => "current-page") + # end + # content_tag('div', content, :class => "pagination") + # end + #TODO: 待删 def watch_projects(state) content = ''.html_safe case state diff --git a/app/views/users/_course_list_have_entity.html.erb b/app/views/users/_course_list_have_entity.html.erb index 87dd5263..19fb88a6 100644 --- a/app/views/users/_course_list_have_entity.html.erb +++ b/app/views/users/_course_list_have_entity.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to "#{l(:label_course_new)}", new_project_path(course: 1, project_type: 1), class: 'icon icon-add' if @user == User.current %>
      diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb index 31780e30..bd9ceab8 100644 --- a/app/views/users/_my_joinedcourse.html.erb +++ b/app/views/users/_my_joinedcourse.html.erb @@ -11,7 +11,7 @@

      <% end %> <% else %> -
      +
      <%= link_to"#{l(:label_course_view_student)}",course_path(course: 1), :class => 'icon icon-add' %>
        diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d521d59f..eae28e85 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,5 +1,24 @@ <% if User.current.id == @user.id%> - <%= show_activity @state%> +
        +
        + <%= "#{@user.name}的动态" %> +
          <%#链接绑定在页面最下方的jQuery%> +
        • "><%=l :label_user_all_activity%>
          • +
        • "><%=l :label_user_activity_myself%>
          • +
        • "><%=l :label_user_all_respond%>
          • +
        +
        + +
        + <%#= show_activity @state%> +
        + + + + + <%= form_tag(:controller => 'users', :action => "show") do %>