From e80149c6c8b477eed3beb61f8f14b5d0bc68ab84 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Sun, 10 Jan 2016 15:38:45 +0800 Subject: [PATCH 01/84] =?UTF-8?q?@7008=E6=89=BE=E4=B8=8D=E5=88=B0=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/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index aa048888c..f3367db59 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -409,7 +409,7 @@ class User < Principal def get_at_show_name name = show_name - name = "#{name} #{self.login}" if name != self.login + (name != self.login) ? "#{name} #{self.login}" : name end #added by nie From 09c772820132f69e818865eae08702e6f0ac28d3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 11 Jan 2016 10:35:25 +0800 Subject: [PATCH 02/84] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/share.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css index ea45a8b41..bb184a2d6 100644 --- a/public/stylesheets/share.css +++ b/public/stylesheets/share.css @@ -18,6 +18,19 @@ a:hover.userCancel{border:1px solid #888888; } .userCard {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px; top:-176px; left:-95px; position:absolute; z-index:999; display:none;} .userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;} .userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;} +.userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;} +.praviteC {background:url(../images/hwork_icon.png) -79px -255px no-repeat;} +.praviteCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;} +.publicC {background:url(../images/hwork_icon.png) -79px -125px no-repeat;} +.publicCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;} +.shild {background:url(../images/hwork_icon.png) -6px -354px no-repeat;} +.shildP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;} +ul.shild:hover li ul {display:block;} +.subNavArrow {background:url(../images/hwork_icon.png) -82px -399px no-repeat; display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;} +ul.subNavArrow:hover li ul {display:block;} +.subNavMenu {line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:20px; top:-10px; padding:5px 0px; display:none; z-index:999;} +.subNavRow {padding:0px 15px; width:70px;} + a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;} a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;} .mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;} From 525d1544c2c2a137e907e3e2d4d143d921f5fea1 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 11 Jan 2016 10:43:48 +0800 Subject: [PATCH 03/84] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_resource_share_for_project_popup.html.erb | 8 +++----- app/views/users/search_user_project.js.erb | 9 +-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb index 2dba25e56..f15c29e90 100644 --- a/app/views/users/_resource_share_for_project_popup.html.erb +++ b/app/views/users/_resource_share_for_project_popup.html.erb @@ -1,10 +1,8 @@ - -
发送到
- @@ -20,13 +18,13 @@ <%= hidden_field_tag(:send_ids, send_ids) %> <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %> <% end %>
- <%= form_tag add_exist_file_to_project_user_path(user),:remote=>true,:id=>'projects_list_form' %> + <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
<%= hidden_field_tag(:send_id, send_id) %> diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb index 0632ebb98..5218c22ab 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -1,11 +1,4 @@ - -//var popupHeight = $(".resourceSharePopup").outerHeight(true); -//$(".resourceSharePopup").css("marginTop",-popupHeight/2); -// -//$("#upload_box").css('left','').css('top',''); -//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); -//$("#upload_box").css('display','block'); -$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); +$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>'); showModal('ajax-modal', '452px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); From f3b732460cef51a3f58e37e035862f504a725e2d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 11 Jan 2016 14:57:52 +0800 Subject: [PATCH 04/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_development_group.html.erb | 2 +- ...60111064927_add_issues_count_to_project.rb | 5 +++ ...065137_add_attachments_count_to_project.rb | 5 +++ ...60111065215_add_boards_count_to_project.rb | 5 +++ ...0160111065530_add_news_count_to_project.rb | 5 +++ db/schema.rb | 33 +++++++++++++++++-- 6 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20160111064927_add_issues_count_to_project.rb create mode 100644 db/migrate/20160111065137_add_attachments_count_to_project.rb create mode 100644 db/migrate/20160111065215_add_boards_count_to_project.rb create mode 100644 db/migrate/20160111065530_add_news_count_to_project.rb diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 83b65fe90..47a1f2a94 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -6,7 +6,7 @@
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> + <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> <% if (issue_count = @project.issues.count) > 0 %> (<%= issue_count %>) <% end %> diff --git a/db/migrate/20160111064927_add_issues_count_to_project.rb b/db/migrate/20160111064927_add_issues_count_to_project.rb new file mode 100644 index 000000000..dcb90b32c --- /dev/null +++ b/db/migrate/20160111064927_add_issues_count_to_project.rb @@ -0,0 +1,5 @@ +class AddIssuesCountToProject < ActiveRecord::Migration + def change + add_column :projects, :issues_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065137_add_attachments_count_to_project.rb b/db/migrate/20160111065137_add_attachments_count_to_project.rb new file mode 100644 index 000000000..aecacfcb6 --- /dev/null +++ b/db/migrate/20160111065137_add_attachments_count_to_project.rb @@ -0,0 +1,5 @@ +class AddAttachmentsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :attachments_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065215_add_boards_count_to_project.rb b/db/migrate/20160111065215_add_boards_count_to_project.rb new file mode 100644 index 000000000..efc4b3f3c --- /dev/null +++ b/db/migrate/20160111065215_add_boards_count_to_project.rb @@ -0,0 +1,5 @@ +class AddBoardsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :boards_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111065530_add_news_count_to_project.rb b/db/migrate/20160111065530_add_news_count_to_project.rb new file mode 100644 index 000000000..63278e2eb --- /dev/null +++ b/db/migrate/20160111065530_add_news_count_to_project.rb @@ -0,0 +1,5 @@ +class AddNewsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :news_count, :integer, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 641f9c75c..c8d649ccd 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 => 20160108021447) do +ActiveRecord::Schema.define(:version => 20160111065530) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -207,6 +207,7 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.integer "author_id" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.integer "homepage_id" end create_table "boards", :force => true do |t| @@ -981,13 +982,14 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.text "notes" t.integer "status" t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false t.string "m_parent_id" t.boolean "is_readed" t.integer "m_reply_count" t.integer "m_reply_id" t.integer "is_comprehensive_evaluation" + t.integer "private", :default => 0 end create_table "kindeditor_assets", :force => true do |t| @@ -1215,6 +1217,18 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.datetime "updated_at", :null => false end + create_table "org_messages", :force => true do |t| + t.integer "user_id" + t.integer "sender_id" + t.integer "organization_id" + t.string "message_type" + t.integer "message_id" + t.integer "viewed" + t.string "content" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "org_projects", :force => true do |t| t.integer "organization_id" t.integer "project_id" @@ -1397,6 +1411,10 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.integer "forked_count" t.integer "commits_count", :default => 0 t.integer "publish_resource", :default => 0 + t.integer "issues_count", :default => 0 + t.integer "attachments_count", :default => 0 + t.integer "boards_count", :default => 0 + t.integer "news_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1543,6 +1561,15 @@ ActiveRecord::Schema.define(:version => 20160108021447) do t.string "description" end + create_table "shield_activities", :force => true do |t| + t.string "container_type" + t.integer "container_id" + t.string "shield_type" + t.integer "shield_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "softapplications", :force => true do |t| t.string "name" t.text "description" From 25a24f72e57ca802797c8a1166ff89de621516f8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 11 Jan 2016 16:44:52 +0800 Subject: [PATCH 05/84] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=8F=8A?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 57 +++++++++++++------ app/views/layouts/_user_projects.html.erb | 48 +++++++++++----- app/views/layouts/new_base_user.html.erb | 34 +++++++---- .../organizations/_subfield_list.html.erb | 2 + app/views/organizations/setting.html.erb | 14 +++-- .../20151231012634_add_last_term_to_course.rb | 17 ------ db/schema.rb | 4 +- public/stylesheets/new_user.css | 2 +- public/stylesheets/org.css | 7 ++- public/stylesheets/public.css | 2 +- public/stylesheets/share.css | 13 +++++ 11 files changed, 130 insertions(+), 70 deletions(-) delete mode 100644 db/migrate/20151231012634_add_last_term_to_course.rb diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 1becb1a33..a8a56b3c5 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -1,25 +1,50 @@ <% courses.each do |course|%>
  • - <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name+"（"+course.time.to_s+course.term+"）"%> -
    -
      -
    • -
        -
      • <%= link_to "发布作业", homework_common_index_path(:course => course.id,:is_new => 1), :class => 'postOptionLink' %>
        • -
      • <%= link_to "发布通知", new_course_news_path(course), :class => 'postOptionLink' %>
        • -
      • <%= link_to "上传资源",upload_files_menu_path(:course_id => course.id), :remote => true, :class => 'postOptionLink' %>
        • -
      • <%= link_to "发布新帖",course_boards_path( course, :flag => true, :is_new => 1), :class => 'postOptionLink' %>
        • -
      • - <% if ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count == 0 %> - <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :course_id => course.id), :method => 'post',:class => 'postOptionLink',:remote => true %> - <% else %> - <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :course_id => course.id),:method => 'delete',:class => 'postOptionLink',:remote => true %> - <% end %> + <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", + :title => (course.is_public ? "公有课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%> + <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %> +
          +
        • +
            +
          • + <%= link_to "作业",homework_common_index_path(:course => course.id), :class => 'fl fontGrey2', :target => '_blank' %> + <%= link_to '+',homework_common_index_path(:course => course.id,:is_new => 1), :class => 'fr fb', :title => '发布作业',:target => '_blank' %> +
            • +
          • + <%= link_to "通知", course_news_index_path(course), :class => 'fl',:target => '_blank' %> + <%= link_to "+", course_news_index_path(course), :class => 'fr fb', :title => '发布通知',:target => '_blank' %> +
            +
            • +
          • + <%= link_to "资源",course_files_path(course), :remote => true, :class => 'fl' %> + <%= link_to "+",upload_files_menu_path(:course_id => course.id), :class => 'fr fb', :title => '上传资源' %> +
            +
            • +
          • + <%= link_to "论坛",course_boards_path(course), :class => 'fl',:target => '_blank' %> + <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'fr fb', :title => '发布帖子',:target => '_blank' %> +
            +
            • + <% if User.current == @user %> +
          • + <% if count == 0 %> + <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :course_id => course.id), :method => 'post',:remote => true %> + <% else %> + <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :course_id => course.id),:remote => true %> + <% end %> +
            • + <% end %> + <% if User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %> +
          • + <%= link_to course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => course}, + :remote=>true,:confirm=>"您确定要设置为"+(course.is_public == 0 ? "公开" : "私有")+"吗"%> +
            +
            • + <% end %>
        -
    • <% end %> diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index 88be91d70..f822021e0 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,24 +1,44 @@ <% projects.each do |project|%>
  • + <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %> <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%> -
    -
      -
    • -
        -
      • <%=link_to "发布问题", new_project_issue_path(project), :class => 'postOptionLink', :target => '_blank' %>
        • -
      • <%=link_to "发布新帖",project_boards_path(project, :flag => true), :class => 'postOptionLink',:target => '_blank' %>
        • -
      • <%= link_to "上传资源",upload_files_menu_path(:project_id => project.id), :remote => true, :class => 'postOptionLink' %>
        • -
      • - <% if ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count == 0 %> - <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :project_id => project.id), :method => 'post',:class => 'postOptionLink',:remote => true %> - <% else %> - <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :project_id => project.id),:method => 'delete',:class => 'postOptionLink',:remote => true %> - <% end %> +
          +
        • +
            +
          • + <%=link_to "问题跟踪", new_project_issue_path(project), :class => 'fl fontGrey2', :target => '_blank',:style => "width:48px;" %> + <%=link_to "+", new_project_issue_path(project), :class => 'fr fb', :target => '_blank',:style => "width:48px;", :title => '发布问题',:style =>'width:10px;' %> +
            • +
          • + <%=link_to "资源", upload_files_menu_path(:project_id => project.id),:remote => true,:class => 'fl fontGrey2' %> + <%=link_to "+", upload_files_menu_path(:project_id => project.id),:remote => true,:class => 'fr fb',:title => '上传资源'%> +
            +
            • +
          • + <%=link_to "论坛", project_boards_path(project, :flag => true),:remote => true,:class => 'fl fontGrey2', :target => '_blank'%> + <%=link_to "+", project_boards_path(project, :flag => true),:remote => true,:class => 'fr fb', :target => '_blank',:title => '发布帖子'%> +
            +
            • + <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, project)) && rep_is_gitlab?(project) %> +
          • + <%= link_to '版本库', url_for(:controller => 'projects', :action => 'settings', :id => project.id, :tab=>'repositories') , :target => '_blank',:class => "fl",:title => '新建版本库' %> +
            +
            • + <% end %> + <% if User.current == @user %> +
          • + <% if ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count == 0 %> + <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :project_id => project.id), :method => 'post',:remote => true %> + <% else %> + <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :project_id => project.id),:method => 'delete',:remote => true %> + <% end %> +
            +
            • + <% end %>
        -
    • <% end %> <% if projects.size == 5%> diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 52af845ed..b2c19d763 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -52,15 +52,25 @@ }) $(".coursesLineGrey").mouseout(function(){ $(this).css("color","#808080"); - }) - $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){ - $(this).prev().css("color","#ffffff"); - $(this).css("z-index", "9999"); - }) - $(".homepagePostSetting").mouseout(function(){ - $(this).prev().css("color","#808080"); - $(this).css("z-index", "1"); - }) + }); + + //侧导航栏配置设置 + $(".homepageLeftMenuCoursesLine").mouseover(function(){ + $(this).children(".shild").css("background","url(/images/hwork_icon.png) -82px -399px no-repeat"); + $(this).children().css("color","#ffffff"); + }); + $(".homepageLeftMenuCoursesLine").mouseout(function(){ + $(this).children(".shild").css("background","url(/images/hwork_icon.png) -6px -354px no-repeat"); + $(this).children().css("color","#808080"); + }); + $(".subNavRow").mouseover(function(){ + $(this).css("background-color","#269ac9"); + $(this).children().css("color","#ffffff"); + }); + $(".subNavRow").mouseout(function(){ + $(this).css("background-color","#ffffff"); + $(this).children().css("color","#888888"); + }); }) @@ -165,7 +175,7 @@ <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
      -
    • +
      • <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%> @@ -179,7 +189,7 @@
    <% else%> - <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%> + <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:style => "margin-right:10px;", :remote => true, :title => "加入课程"%> <% end%> <% end%>
    @@ -193,7 +203,7 @@ 项目 <% if is_current_user%> - <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :title => "新建项目"%> + <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%> <% end%>
    <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%> diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index de837c66f..b8af1e85e 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -2,6 +2,7 @@
  • 已有栏目
  • 状态
  • 类型
    • +
  • 域名目录
    • @@ -26,6 +27,7 @@
  • 新增
  • <%= field.field_type == "Post" ? "帖子" : "资源" %>
    • + <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %> <%= field.hide==0?"设为隐藏":"设为可见" %> <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %> diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 2e9058c40..40cc295d9 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -111,20 +111,26 @@ :subfields => @organization.org_subfields.where("field_type != 'default'") } %>
    -
    +

    新增栏目

    <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %> - + +
    +

    域名目录（用户自定义url，可选）

    + micros.trustie.net/ +
    +
    • 栏目类型
      • -
    • +
      • -
    • +
      • +
    确定 diff --git a/db/migrate/20151231012634_add_last_term_to_course.rb b/db/migrate/20151231012634_add_last_term_to_course.rb deleted file mode 100644 index 1b342eaaf..000000000 --- a/db/migrate/20151231012634_add_last_term_to_course.rb +++ /dev/null @@ -1,17 +0,0 @@ -class AddLastTermToCourse < ActiveRecord::Migration - def change - add_column :courses, :end_time, :integer - add_column :courses, :end_term, :string - - count = Course.all.count / 30 + 2 - transaction do - for i in 1 ... count do - Course.page(i).per(30).each do |course| - course.end_time = course.time - course.end_term = course.term - course.save - end - end - end - end -end diff --git a/db/schema.rb b/db/schema.rb index e816d1d6e..b21b5057d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -982,8 +982,8 @@ ActiveRecord::Schema.define(:version => 20160108093752) do t.text "notes" t.integer "status" t.integer "reply_id" - t.datetime "created_on", :null => false - t.datetime "updated_on", :null => false + t.datetime "created_on", :null => false + t.datetime "updated_on", :null => false t.string "m_parent_id" t.boolean "is_readed" t.integer "m_reply_count" diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 7456c904b..830ed797e 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -581,7 +581,7 @@ a.homepageImageNumber:hover {color:#269ac9;} .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;} .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;} -a.coursesLineGrey {padding-left:25px; color:#808080; display:block;} +a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 2279f0fe5..02e6ce340 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -18,11 +18,11 @@ .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} a.saveBtn:hover {background-color:#297fb8;} -.orgMemberList {width:410px; float:left;} +.orgMemberList {width:460px; float:left;} .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} -.orgListUser {width:119px; float:left;} +.orgListUser {width:85px; float:left;} .orgListRole {width:180px; float:left;} -.orgMemContainer {width:278px;} +.orgMemContainer {width:228px;} .orgMemberAdd {float:right; width:240px;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} .undis {display:none;} @@ -73,6 +73,7 @@ a.linkGrey8:hover {color:#585858;} .org_login_list a {color:#269ac9;} .orgListStatus {width:55px; float:left;} +.personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;} .reCon{ margin:5px; width:710px;} .retop{width:710px; height:40px; background:#eaeaea; padding:5px;} .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index dcb1a34f2..8047504e1 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -511,7 +511,7 @@ a.homepageImageNumber:hover {color:#15bccf;} .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;} .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;} -a.coursesLineGrey {padding-left:25px; color:#15bccf; display:block;} +a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#b3e0ee;} diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css index 59b3b63f9..b36d80082 100644 --- a/public/stylesheets/share.css +++ b/public/stylesheets/share.css @@ -18,6 +18,19 @@ a:hover.userCancel{border:1px solid #888888; } .userCard {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px; top:-176px; left:-95px; position:absolute; z-index:999; display:none;} .userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;} .userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;} +.userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;} +.praviteC {background:url(../images/hwork_icon.png) -79px -255px no-repeat;} +.praviteCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;} +.publicC {background:url(../images/hwork_icon.png) -79px -125px no-repeat;} +.publicCP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; left:25px;} +.shild {background:url(../images/hwork_icon.png) -6px -354px no-repeat;} +.shildP {display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;} +ul.shild:hover li ul {display:block;} +.subNavArrow {background:url(../images/hwork_icon.png) -82px -399px no-repeat; display:inline-block; width:20px; height:20px; position:absolute; top:10px; right:0px;} +ul.subNavArrow:hover li ul {display:block;} +.subNavMenu {line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:20px; top:-10px; padding:5px 0px; display:none; z-index:999;} +.subNavRow {padding:0px 15px; width:70px;} + a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;} a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;} .mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;} From 2f5ada2d7b696b401afa765c0c4ec5e8a3ba9135 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 11 Jan 2016 16:56:57 +0800 Subject: [PATCH 06/84] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E8=AE=BE=E4=B8=BA?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=90=8E=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=A4=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blogs/_article.html.erb | 21 +++++++++++++++------ app/views/blogs/_article_list.html.erb | 5 ----- app/views/blogs/_homepage.html.erb | 2 +- app/views/users/show.html.erb | 6 ++++++ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 0b813c4a7..cc0825652 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -26,12 +26,21 @@ ) if User.current && User.current.id == activity.author.id %>
  • - <%= link_to( - l(:button_set_homepage), - {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id}, - :method => :post, - :class => 'postOptionLink' - ) if User.current && User.current.id == activity.blog.author_id %> + <% if activity.id == activity.blog.homepage_id %> + <%= link_to( + l(:button_cancel_homepage), + {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id}, + :method => :post, + :class => 'postOptionLink' + ) if User.current && User.current.id == activity.blog.author_id %> + <% else %> + <%= link_to( + l(:button_set_homepage), + {:controller => 'blogs',:action => 'set_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id}, + :method => :post, + :class => 'postOptionLink' + ) if User.current && User.current.id == activity.blog.author_id %> + <% end %>
    • diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb index 182db9dd0..ca85c0ba2 100644 --- a/app/views/blogs/_article_list.html.erb +++ b/app/views/blogs/_article_list.html.erb @@ -43,11 +43,6 @@
    - <% if blog.homepage_id and BlogComment.where("id=?", blog.homepage_id).count > 0 %> - <% homepage = BlogComment.find(blog.homepage_id) %> - <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %> - <% end %> - <% if User.current.logged? && User.current.id == @user.id %> <%= labelled_form_for @article, :url =>{:controller=>'blog_comments',:action => 'create',:user_id=>user.id , :blog_id => blog.id}, :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %> diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb index 30e1b69a5..99835c87d 100644 --- a/app/views/blogs/_homepage.html.erb +++ b/app/views/blogs/_homepage.html.erb @@ -36,7 +36,7 @@
    <%end%>
    - + +<% if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %> + <% homepage = BlogComment.find(@user.blog.homepage_id) %> + <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %> +<% end %> + <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> From 48f931debab51d0c2e2cb8d9a8b53998b7e46c6c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 11 Jan 2016 17:02:01 +0800 Subject: [PATCH 07/84] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_org_courses.html.erb | 38 ++++++++++++------------ app/views/layouts/_org_projects.html.erb | 36 +++++++++++----------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/views/layouts/_org_courses.html.erb b/app/views/layouts/_org_courses.html.erb index b2bd8e428..4085cce22 100644 --- a/app/views/layouts/_org_courses.html.erb +++ b/app/views/layouts/_org_courses.html.erb @@ -2,25 +2,25 @@ <%# pro = Project.find course.course_id %>
  • <%= link_to course.name, course_path(course.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => course.name%> -
    -
      -
    • -
        -
      • <%= link_to "发布作业", homework_common_index_path(:course => course.id,:is_new => 1), :class => 'postOptionLink' %>
        • -
      • <%= link_to "发布通知", new_course_news_path(course), :class => 'postOptionLink' %>
        • -
      • <%= link_to "上传资源",upload_files_menu_path(:course_id => course.id), :remote => true, :class => 'postOptionLink' %>
        • -
      • <%= link_to "发布新帖",course_boards_path( course, :flag => true, :is_new => 1), :class => 'postOptionLink' %>
        • -
      • - <% if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Course' and shield_id=#{course.id}").count == 0 %> - <%= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'post',:class => 'postOptionLink',:remote => true %> - <% else %> - <%= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :course_id => course.id), :method => 'delete',:class => 'postOptionLink',:remote => true %> - <% end %> -
        • -
      -
      • -
    -
    + + + + + + + + + + + + + + + + + + +
    • <% end %> <% if courses.size == 5%> diff --git a/app/views/layouts/_org_projects.html.erb b/app/views/layouts/_org_projects.html.erb index 00c5db642..7df93e40b 100644 --- a/app/views/layouts/_org_projects.html.erb +++ b/app/views/layouts/_org_projects.html.erb @@ -2,24 +2,24 @@ <%# pro = Project.find project.project_id %>
  • <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%> -
    -
      -
    • -
        -
      • <%=link_to "发布问题", new_project_issue_path(project), :class => 'postOptionLink', :target => '_blank' %>
        • -
      • <%=link_to "发布新帖",project_boards_path(project, :flag => true), :class => 'postOptionLink',:target => '_blank' %>
        • -
      • <%= link_to "上传资源",upload_files_menu_path(:project_id => project.id), :remote => true, :class => 'postOptionLink' %>
        • -
      • - <% if ShieldActivity.where("container_type='Organization' and container_id=#{org_id} and shield_type='Project' and shield_id=#{project.id}").count == 0 %> - <%= link_to "屏蔽动态", shield_activities_path(:org_id => org_id, :project_id => project.id), :method => 'post',:class => 'postOptionLink',:remote => true %> - <% else %> - <%= link_to "显示动态", show_acts_shield_activities_path(:org_id => org_id, :project_id => project.id),:method => 'delete',:class => 'postOptionLink',:remote => true %> - <% end %> -
        • -
      -
      • -
    -
    + + + + + + + + + + + + + + + + + +
    • <% end %> <% if projects.size == 5%> From 1239a8b5af025d4fb153026ca04b13b25bdeef7a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 10:38:50 +0800 Subject: [PATCH 08/84] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 32 +++++++++---------- .../20160111071348_static_project_boards.rb | 19 +++++++++++ .../20160111071411_static_project_issues.rb | 12 +++++++ .../20160111071529_static_project_news.rb | 12 +++++++ ...160111071558_static_project_attachments.rb | 12 +++++++ ...0160111080833_add_acts_count_to_project.rb | 5 +++ .../20160111080914_static_project_acts.rb | 12 +++++++ 7 files changed, 88 insertions(+), 16 deletions(-) create mode 100644 db/migrate/20160111071348_static_project_boards.rb create mode 100644 db/migrate/20160111071411_static_project_issues.rb create mode 100644 db/migrate/20160111071529_static_project_news.rb create mode 100644 db/migrate/20160111071558_static_project_attachments.rb create mode 100644 db/migrate/20160111080833_add_acts_count_to_project.rb create mode 100644 db/migrate/20160111080914_static_project_acts.rb diff --git a/app/models/project.rb b/app/models/project.rb index cd4036810..f17124478 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -155,7 +155,7 @@ class Project < ActiveRecord::Base # 创建project之后默认创建一个board，之后的board去掉了board的概念 after_create :create_board_sync,:acts_as_forge_activities,:create_project_ealasticsearch_index before_destroy :delete_all_members,:delete_project_ealasticsearch_index - after_update :update_project_ealasticsearch_index + # after_update :update_project_ealasticsearch_index def remove_references_before_destroy return if self.id.nil? Watcher.delete_all ['watchable_id = ?', id] @@ -1223,21 +1223,21 @@ class Project < ActiveRecord::Base self.__elasticsearch__.index_document end end - def update_project_ealasticsearch_index - if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性 - begin - self.__elasticsearch__.update_document - rescue => e - self.__elasticsearch__.index_document - end - else #如果是更新成为私有的，那么索引就要被删除 - begin - self.__elasticsearch__.delete_document - rescue => e - - end - end - end + # def update_project_ealasticsearch_index + # if self.is_public #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性 + # begin + # self.__elasticsearch__.update_document + # rescue => e + # self.__elasticsearch__.index_document + # end + # else #如果是更新成为私有的，那么索引就要被删除 + # begin + # self.__elasticsearch__.delete_document + # rescue => e + # + # end + # end + # end def delete_project_ealasticsearch_index begin self.__elasticsearch__.delete_document diff --git a/db/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb new file mode 100644 index 000000000..1d85860c6 --- /dev/null +++ b/db/migrate/20160111071348_static_project_boards.rb @@ -0,0 +1,19 @@ +class StaticProjectBoards < ActiveRecord::Migration + def up + begin + Project.all.each do |project| + puts project.id + unless project.boards.first.nil? + boards_count = project.boards.first.topics.count + project.update_attribute(:boards_count, boards_count) + end + end + ensure + self.down + end + end + + def down + Project.update_all(:boards_count => false) + end +end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb new file mode 100644 index 000000000..273527164 --- /dev/null +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -0,0 +1,12 @@ +class StaticProjectIssues < ActiveRecord::Migration + def up + Project.all.each do |project| + issues_count = project.issues.count + project.update_attribute(:issues_count, boards_count) + end + end + + def down + Project.all.update_all(:issues_count => false) + end +end diff --git a/db/migrate/20160111071529_static_project_news.rb b/db/migrate/20160111071529_static_project_news.rb new file mode 100644 index 000000000..6ccefbc32 --- /dev/null +++ b/db/migrate/20160111071529_static_project_news.rb @@ -0,0 +1,12 @@ +class StaticProjectNews < ActiveRecord::Migration + def up + Project.all.each do |project| + news_count = project.news.count + project.update_attribute(:news_count, news_count) + end + end + + def down + Project.all.update_all(:news_count => false) + end +end diff --git a/db/migrate/20160111071558_static_project_attachments.rb b/db/migrate/20160111071558_static_project_attachments.rb new file mode 100644 index 000000000..af4a282ed --- /dev/null +++ b/db/migrate/20160111071558_static_project_attachments.rb @@ -0,0 +1,12 @@ +class StaticProjectAttachments < ActiveRecord::Migration + def up + Project.all.each do |project| + attachments_count = project.attachments.count + project.update_attribute(:attachments_count, attachments_count) + end + end + + def down + Project.all.update_all(:attachments_count => false) + end +end diff --git a/db/migrate/20160111080833_add_acts_count_to_project.rb b/db/migrate/20160111080833_add_acts_count_to_project.rb new file mode 100644 index 000000000..a990302bc --- /dev/null +++ b/db/migrate/20160111080833_add_acts_count_to_project.rb @@ -0,0 +1,5 @@ +class AddActsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :acts_count, :integer, :default => false + end +end diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb new file mode 100644 index 000000000..6f0d4a2e6 --- /dev/null +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -0,0 +1,12 @@ +class StaticProjectActs < ActiveRecord::Migration + def up + Project.all.each do |project| + acts_count = ForgeActivity.where("project_id = ?", project.id).count + project.update_attribute(:acts_count, acts_count) + end + end + + def down + Project.all.update_all(:acts_count => false) + end +end From 500527a12d4386033ab140fcad19de6be0c1912b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 10:42:25 +0800 Subject: [PATCH 09/84] =?UTF-8?q?gitlab=E5=90=8C=E6=AD=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/trustie/gitlab/manage_member.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/trustie/gitlab/manage_member.rb b/lib/trustie/gitlab/manage_member.rb index 433b101f5..5c75d9d6e 100644 --- a/lib/trustie/gitlab/manage_member.rb +++ b/lib/trustie/gitlab/manage_member.rb @@ -5,6 +5,8 @@ module Trustie module Gitlab module ManageMember + attr :g + include Helper def self.included(base) base.class_eval { before_create :add_gitlab_member From 83881766b2546217a26213c85f3b1d289e28b78b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 11:01:58 +0800 Subject: [PATCH 10/84] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 2 +- app/helpers/application_helper.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 1674055ac..0f3724d6f 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -357,7 +357,7 @@ update @changesets = g.commits(@project.gpid, :ref_name => @rev) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count - @changesets_all_count = @project.gpid.nil? ? 0 : g.commits_total_count(@project.gpid).count + @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count @changesets_latest_coimmit = @changesets[0] @properties = @repository.properties(@path, @rev) @repositories = @project.repositories diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9b7888bf2..4fcb43172 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2784,8 +2784,7 @@ int main(int argc, char** argv){ #代码提交数量 def changesets_num project g = Gitlab.client - project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count - # # commits_total_count(project.gpid) + project.gpid.nil? ? 0 : g.project(project.gpid).commit_count # project.changesets.count end end From 8758235364534050144a5866acd3db1051d58308 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 15:10:02 +0800 Subject: [PATCH 11/84] =?UTF-8?q?issue=E5=88=9B=E5=BB=BA=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8Cissues=5Fcount+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 16 ++++++++++++++-- .../20160111071348_static_project_boards.rb | 5 ----- .../20160111071411_static_project_issues.rb | 3 +-- db/migrate/20160111071529_static_project_news.rb | 7 ++++--- .../20160111071558_static_project_attachments.rb | 7 ++++--- db/migrate/20160111080914_static_project_acts.rb | 10 +++++++--- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 5ecb3e36f..4d2776ff7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -83,9 +83,9 @@ class Issue < ActiveRecord::Base attr_reader :current_journal # fq - after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message + after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message, :add_issues_count after_update :be_user_score - after_destroy :down_user_score + after_destroy :down_user_score, :decrease_issues_count # after_create :be_user_score # end @@ -165,6 +165,18 @@ class Issue < ActiveRecord::Base end end + # 创建issue的时候，issues_count加1 + def add_issues_count + issue_count = self.project.issues_count + 1 + self.project.update_attribute(:issues_count, issue_count) + end + + # 删除issue的时候，issues_count减1 + def decrease_issues_count + issue_count = self.project.issues_count - 1 + self.project.update_attribute(:issues_count, issue_count) + end + # 更新缺陷 #def act_as_forge_message_update # unless self.author_id == self.assigned_to_id diff --git a/db/migrate/20160111071348_static_project_boards.rb b/db/migrate/20160111071348_static_project_boards.rb index 1d85860c6..4b82be23c 100644 --- a/db/migrate/20160111071348_static_project_boards.rb +++ b/db/migrate/20160111071348_static_project_boards.rb @@ -1,6 +1,5 @@ class StaticProjectBoards < ActiveRecord::Migration def up - begin Project.all.each do |project| puts project.id unless project.boards.first.nil? @@ -8,12 +7,8 @@ class StaticProjectBoards < ActiveRecord::Migration project.update_attribute(:boards_count, boards_count) end end - ensure - self.down - end end def down - Project.update_all(:boards_count => false) end end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb index 273527164..d9a3a24ff 100644 --- a/db/migrate/20160111071411_static_project_issues.rb +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -2,11 +2,10 @@ class StaticProjectIssues < ActiveRecord::Migration def up Project.all.each do |project| issues_count = project.issues.count - project.update_attribute(:issues_count, boards_count) + project.update_attribute(:issues_count, issues_count) end end def down - Project.all.update_all(:issues_count => false) end end diff --git a/db/migrate/20160111071529_static_project_news.rb b/db/migrate/20160111071529_static_project_news.rb index 6ccefbc32..f013a929d 100644 --- a/db/migrate/20160111071529_static_project_news.rb +++ b/db/migrate/20160111071529_static_project_news.rb @@ -1,12 +1,13 @@ class StaticProjectNews < ActiveRecord::Migration def up Project.all.each do |project| - news_count = project.news.count - project.update_attribute(:news_count, news_count) + unless project.news.nil? + news_count = project.news.count + project.update_attribute(:news_count, news_count) + end end end def down - Project.all.update_all(:news_count => false) end end diff --git a/db/migrate/20160111071558_static_project_attachments.rb b/db/migrate/20160111071558_static_project_attachments.rb index af4a282ed..692ca68eb 100644 --- a/db/migrate/20160111071558_static_project_attachments.rb +++ b/db/migrate/20160111071558_static_project_attachments.rb @@ -1,12 +1,13 @@ class StaticProjectAttachments < ActiveRecord::Migration def up Project.all.each do |project| - attachments_count = project.attachments.count - project.update_attribute(:attachments_count, attachments_count) + unless project.attachments.nil? + attachments_count = project.attachments.count + project.update_attribute(:attachments_count, attachments_count) + end end end def down - Project.all.update_all(:attachments_count => false) end end diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb index 6f0d4a2e6..c368507a3 100644 --- a/db/migrate/20160111080914_static_project_acts.rb +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -1,12 +1,16 @@ class StaticProjectActs < ActiveRecord::Migration def up Project.all.each do |project| - acts_count = ForgeActivity.where("project_id = ?", project.id).count - project.update_attribute(:acts_count, acts_count) + acts = ForgeActivity.where("project_id = ?", project.id) + unless acts.blank? + acts_count = acts.count + puts project.id + puts "acts_count is #{acts_count}" + project.update_attribute(:acts_count, acts_count) + end end end def down - Project.all.update_all(:acts_count => false) end end From a74e5f9d308b6ff1a82d2e7cefbe218dd9146523 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 12 Jan 2016 15:18:40 +0800 Subject: [PATCH 12/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=95=B0=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160111080914_static_project_acts.rb | 6 +++--- db/schema.rb | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/db/migrate/20160111080914_static_project_acts.rb b/db/migrate/20160111080914_static_project_acts.rb index c368507a3..3f07cbb03 100644 --- a/db/migrate/20160111080914_static_project_acts.rb +++ b/db/migrate/20160111080914_static_project_acts.rb @@ -3,10 +3,10 @@ class StaticProjectActs < ActiveRecord::Migration Project.all.each do |project| acts = ForgeActivity.where("project_id = ?", project.id) unless acts.blank? - acts_count = acts.count + count = acts.count puts project.id - puts "acts_count is #{acts_count}" - project.update_attribute(:acts_count, acts_count) + puts "acts_count is #{count}" + project.update_attribute(:acts_count, count) end end end diff --git a/db/schema.rb b/db/schema.rb index c8d649ccd..6197c2c76 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 => 20160111065530) do +ActiveRecord::Schema.define(:version => 20160111080914) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1415,6 +1415,7 @@ ActiveRecord::Schema.define(:version => 20160111065530) do t.integer "attachments_count", :default => 0 t.integer "boards_count", :default => 0 t.integer "news_count", :default => 0 + t.integer "acts_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" From d5fc0277a266482126ef39d5ebc82f88f6d7b6cb Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 12 Jan 2016 16:43:40 +0800 Subject: [PATCH 13/84] =?UTF-8?q?3.2=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 1 + app/controllers/org_subfields_controller.rb | 23 ++-- app/views/files/_org_subfield_list.html.erb | 126 ++++++++++-------- app/views/files/_subfield_files.html.erb | 123 +++++++++++------ app/views/files/index.js.erb | 2 + .../files/search_files_in_subfield.js.erb | 9 +- .../_org_left_subfield_list.html.erb | 2 +- config/routes.rb | 1 + public/javascripts/org.js | 24 ++++ public/stylesheets/org.css | 8 +- public/stylesheets/share.css | 10 +- 11 files changed, 218 insertions(+), 111 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index c6773ef57..4bbb8a444 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -380,6 +380,7 @@ class FilesController < ApplicationController @organization = Organization.find(@containers.first.organization_id) show_attachments @containers @tag_list = attachment_tag_list @all_attachments + @page = params[:page] || 1 render :layout => 'base_org' # @subfield = params[:org_subfield_id] end diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 66a236b5b..5db82436b 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -7,15 +7,22 @@ class OrgSubfieldsController < ApplicationController end def show - @org_subfield = OrgSubfield.find(params[:id]) - @organization = @org_subfield.organization.id - @messages = [] - @messages << @org_subfield.org_document_comments - @messages << @org_subfield.messages - @messages.sort{|a, b| b.updated_at <=> a.updated_at} - respond_to do |format| - format.html{render :layout => 'base_org'} + @organization = Organization.find(params[:id]) + @subfield = @organization.org_subfields.first + if @subfield.field_type == 'Post' + redirect_to organization_path(@organization, :org_subfield_id => @subfield.id) + else + end + # @org_subfield = OrgSubfield.find(params[:id]) + # @organization = @org_subfield.organization.id + # @messages = [] + # @messages << @org_subfield.org_document_comments + # @messages << @org_subfield.messages + # @messages.sort{|a, b| b.updated_at <=> a.updated_at} + # respond_to do |format| + # format.html{render :layout => 'base_org'} + # end end def destroy @subfield = OrgSubfield.find(params[:id]) diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb index ad90550d4..504558b15 100644 --- a/app/views/files/_org_subfield_list.html.erb +++ b/app/views/files/_org_subfield_list.html.erb @@ -1,59 +1,77 @@ <% delete_allowed = User.current.admin? %> -
    -

    共有 <%= all_attachments.count%> 个资源

    -

    - <% if order == "asc" %> - 按 <%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %> /  - <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %> /  - <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %> 排序 - <% else %> - 按 <%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %> /  - <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>  /  - <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %> 排序 - <% end %> -

    -
    -
    -
    - <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%> -
    -
    -
    - <% org_subfield_attachments.each do |file| %> - <% if 1 %> -
    -
    - <%= link_to truncate(file.filename,length: 35, omission: '...'), - download_named_attachment_path(file.id, file.filename), - :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> +<% org_subfield_attachments.each do |file| %> +
    +
    +
    + <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %> +
    +
    +
    + <%= link_to truncate(file.filename,length: 35, omission: '...'), + download_named_attachment_path(file.id, file.filename), + :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> + <%= file_preview_eye(file, class: 'preview') %> + + <% if file.is_public? == false%> + 私有 + <%end %> + +
    +
    + 上传时间：<%= format_date(file.created_on)%> + <% if file.tag_list.length > 0%> + 上传类型：<%= file.tag_list[0] %> + <% end %> +

    文件大小：<%= number_to_human_size(file.filesize) %>

    +

    下载<%= file.downloads%>  |  引用<%= file.quotes.nil? ? 0:file.quotes %>

    +
    +
    +
    + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> + <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %> +
    +
    +
      +
    • <% if User.current.logged? %> - <% if !@org_subfield.attachments.all.include?file %> - <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> - <% elsif @org_subfield.organization.org_subfields.where("field_type='Resource'").count > 1 %> - <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> + <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" %> +
        +
      • <%= link_to("发       送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')") %>
        • +
      • <%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %>
        • +
      • + + <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post %> + +
        • +
      • + <%= link_to( '删除资源', attachment_path(file), + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield" && file.destroyable %> +
        • +
      + <%else%> +
        +
      • <%= link_to("发  送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')") %>
        • +
      <% end %> - <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %> <% end %> -
    -
    -
    -

    文件大小：<%= number_to_human_size(file.filesize) %>

    - <%= link_to( l(:button_delete), attachment_path(file), - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%> -

    <%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>  |  下载<%= file.downloads %>  |  引用<%= file.quotes.nil? ? 0:file.quotes %>

    -
    -
    -
    - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> - <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %> -
    -
    -
    - <% end %> - <% end %> -
    -
      - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%> -
    -
    + + + +
    +
    +
    +
    + +
    +<% end %> + +<% if org_subfield_attachments.count == 10 %> + <% if params[:action] == 'search_files_in_subfield' %> + <%=link_to "点击展开更多", search_files_in_subfield_org_subfield_files_path({:org_subfield_id => org_subfield.id,:page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> + <% else %> + + <%=link_to "点击展开更多", org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page + 1), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %> + <%end%> +<% end%> + diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb index 09f74d3cd..15d7f4cff 100644 --- a/app/views/files/_subfield_files.html.erb +++ b/app/views/files/_subfield_files.html.erb @@ -1,4 +1,4 @@ -<%= stylesheet_link_tag 'courses' %> +<%= stylesheet_link_tag 'courses'%> -
    -
    -
    - <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %> - <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%> - <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %> - <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> +
    +
    +
    <%= org_subfield.name %>
    + +
    +
    +
    + <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %> + <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%> + <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %> + <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> + + <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %> <% end %> - <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %> - -

    - 上传： - - 软件 |  - 媒体 |  - 代码 |  - - 其他 -

    - <%# end %>
    -
    - <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments} %> -
    - +
    +
    +
    + <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%> +
    +
    +

    共有 <%= @all_attachments.count %> 个资源

    +

    + <% if @order == "asc" %> + 按 <%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> /  + <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %> /  + <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %> 排序 + <% else %> + 按 <%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> /  + <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>  /  + <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %> 排序 + <% end %> +

    +
    +
    +
    +
    + <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments} %> +
    +
    -<% html_title(l(:label_attachment_plural)) -%> \ No newline at end of file +<% html_title(l(:label_attachment_plural)) -%> + \ No newline at end of file diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb index fe24c9be0..49e7ac714 100644 --- a/app/views/files/index.js.erb +++ b/app/views/files/index.js.erb @@ -2,4 +2,6 @@ $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/course_list',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>"); <% elsif @project %> $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/project_list', :locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments})%>"); +<% elsif @org_subfield %> + $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list', :locals => {org_subfield:@org_subfield, all_attachments:@all_attachments, sort:@sort, order:@order, org_subfield_attachments:@obj_attachments})%>"); <%end %> \ No newline at end of file diff --git a/app/views/files/search_files_in_subfield.js.erb b/app/views/files/search_files_in_subfield.js.erb index deed2d5d3..dfaa56a6c 100644 --- a/app/views/files/search_files_in_subfield.js.erb +++ b/app/views/files/search_files_in_subfield.js.erb @@ -1,2 +1,7 @@ -$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list', - :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>"); \ No newline at end of file +<% if (@obj_pages &&( @obj_pages.page > 1)) || (@feedback_pages && (@feedback_pages.page > 1)) %> + $("#show_more_attachments").replaceWith("<%= escape_javascript( render :partial => 'files/org_subfield_list', + :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach} )%>"); +<% else %> + $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list', + :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index 8280a2be7..cbce501e5 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -75,7 +75,7 @@ <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%> <% end %> <% else %> - <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %> + <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :name => field.name), :class => "homepageMenuText" %> <% if User.current.member_of_org?organization %> <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %> diff --git a/config/routes.rb b/config/routes.rb index 133203a8b..1f04f65d5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -54,6 +54,7 @@ RedmineApp::Application.routes.draw do post 'logout' post 'apply_subdomain' get 'org_resources_subfield' + get '/:name', :to => 'org_subfields#show', :as => 'show_org_subfield' end collection do get 'check_uniq' diff --git a/public/javascripts/org.js b/public/javascripts/org.js index 1e1951006..636b84baa 100644 --- a/public/javascripts/org.js +++ b/public/javascripts/org.js @@ -50,4 +50,28 @@ function show_more_org_course(url){ {page: $("#org_course_page_num").val()}, function (data){} ); +} + +function search_tag_attachment(url,tag_name,q,course_id,sort) +{ + //alert("111"); + //clearTimeout(clickFunction); + clickFunction = setTimeout(function() { + search_func() + }, 500); + function search_func(){ + if(isdb!= false ) return; + $.get( + url, + { + tag_name: tag_name, + q: q, + org_subfield_id:course_id + }, + function (data) { + + } + ); + } + } \ No newline at end of file diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 02e6ce340..2ebdcf654 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -108,4 +108,10 @@ div.flash {margin-top :0px !important} .w80{ width:80px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} -.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} \ No newline at end of file +.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} +.researchBox { width:240px; height:24px; border:1px solid #dddddd; color:#666666; outline:none;} +.blueBtn{ width:60px; height:26px; color:#FFF; border:none; background-color:#269ac9; cursor:pointer; padding-left:0px; text-align:center;} +.blueBtn:hover {background-color:#298fbd;} +/*文本描述展开高度*/ +.maxh360 {max-height: 810px;} +.lh18 { line-height: 18px;} \ No newline at end of file diff --git a/public/stylesheets/share.css b/public/stylesheets/share.css index b36d80082..0c0597507 100644 --- a/public/stylesheets/share.css +++ b/public/stylesheets/share.css @@ -41,4 +41,12 @@ a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; backg a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;} .homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} -.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;} \ No newline at end of file +.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:21px; float:left;} + +a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;} + +.mediaIcon {background:url(../images/hwork_icon.png) -5px -160px no-repeat; padding-left:23px;} +.codeIcon {background:url(../images/hwork_icon.png) -78px -160px no-repeat; padding-left:23px;} +.othersIcon {background:url(../images/hwork_icon.png) -3px -210px no-repeat; padding-left:23px;} +.thesisIcon {background:url(../images/hwork_icon.png) -78px -212px no-repeat; padding-left:23px;} +.softwareIcon {background:url(../images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;} \ No newline at end of file From 5d9ce929d9440848d982f7054134df22fbad18f8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 13 Jan 2016 09:34:33 +0800 Subject: [PATCH 14/84] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E5=AD=90=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_subfields_controller.rb | 60 +- app/models/org_subfield.rb | 1 + app/models/subfield_subdomain_dir.rb | 4 + app/views/org_subfields/show.html.erb | 581 ++++++++++++++++++ .../reject_apply_subdomain.js.erb | 0 app/views/organizations/setting.html.erb | 44 +- ...160108093752_add_status_to_org_messages.rb | 5 + ...12085834_create_subfield_subdomain_dirs.rb | 9 + db/schema.rb | 9 +- spec/factories/subfield_subdomain_dirs.rb | 6 + spec/models/subfield_subdomain_dir_spec.rb | 5 + 11 files changed, 701 insertions(+), 23 deletions(-) create mode 100644 app/models/subfield_subdomain_dir.rb create mode 100644 app/views/organizations/reject_apply_subdomain.js.erb create mode 100644 db/migrate/20160108093752_add_status_to_org_messages.rb create mode 100644 db/migrate/20160112085834_create_subfield_subdomain_dirs.rb create mode 100644 spec/factories/subfield_subdomain_dirs.rb create mode 100644 spec/models/subfield_subdomain_dir_spec.rb diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 5db82436b..df81ccaff 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -3,6 +3,13 @@ class OrgSubfieldsController < ApplicationController @subfield = OrgSubfield.create(:name => params[:name]) @organization = Organization.find(params[:organization_id]) @organization.org_subfields << @subfield + if !params[:sub_dir].blank? + sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+ + "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'" + if SubfieldSubdomainDir.find_by_sql(sql).count == 0 + SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir]) + end + end @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type]) end @@ -11,9 +18,58 @@ class OrgSubfieldsController < ApplicationController @subfield = @organization.org_subfields.first if @subfield.field_type == 'Post' redirect_to organization_path(@organization, :org_subfield_id => @subfield.id) - else - end + @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+ + "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+ + " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name=#{params[:name]}").first + if params[:sort] + params[:sort].split(",").each do |sort_type| + order_by = sort_type.split(":") + + case order_by[0] + when "filename" + attribute = "filename" + when "size" + attribute = "filesize" + when "attach_type" + attribute = "attachtype" + when "content_type" + attribute = "created_on" + when "field_file_dense" + attribute = "is_public" + when "downloads" + attribute = "downloads" + when "created_on" + attribute = "created_on" + when "quotes" + attribute = "quotes" + else + attribute = "created_on" + end + @sort = order_by[0] + @order = order_by[1] + if order_by.count == 1 && attribute + sort += "#{Attachment.table_name}.#{attribute} asc " + if sort_type != params[:sort].split(",").last + sort += "," + end + elsif order_by.count == 2 && order_by[1] + sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " + if sort_type != params[:sort].split(",").last + sort += "," + end + end + end + else + sort = "#{Attachment.table_name}.created_on desc" + end + @container_type = 2 + @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)] + @organization = Organization.find(@containers.first.organization_id) + show_attachments @containers + @tag_list = attachment_tag_list @all_attachments + @page = params[:page] || 1 + render :layout => 'base_org' # @org_subfield = OrgSubfield.find(params[:id]) # @organization = @org_subfield.organization.id # @messages = [] diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb index 0747114ca..146323a32 100644 --- a/app/models/org_subfield.rb +++ b/app/models/org_subfield.rb @@ -1,5 +1,6 @@ class OrgSubfield < ActiveRecord::Base belongs_to :organization, :foreign_key => :organization_id + has_one :subfield_subdomain_dir has_many :org_document_comments, :dependent => :destroy has_many :files has_many :org_subfield_messages, :dependent => :destroy diff --git a/app/models/subfield_subdomain_dir.rb b/app/models/subfield_subdomain_dir.rb new file mode 100644 index 000000000..9897e19ac --- /dev/null +++ b/app/models/subfield_subdomain_dir.rb @@ -0,0 +1,4 @@ +class SubfieldSubdomainDir < ActiveRecord::Base + # attr_accessible :title, :body + belongs_to :org_subfield +end diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb index e69de29bb..660322c29 100644 --- a/app/views/org_subfields/show.html.erb +++ b/app/views/org_subfields/show.html.erb @@ -0,0 +1,581 @@ + +
    + <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %> +
    + + + + + diff --git a/app/views/organizations/reject_apply_subdomain.js.erb b/app/views/organizations/reject_apply_subdomain.js.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 40cc295d9..59e2f2ad9 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -114,26 +114,30 @@

    新增栏目

    <%= form_tag url_for(:controller => 'org_subfields', :action => 'create', :organization_id => @organization.id), :id=> 'add_subfield_form',:remote => true do %> - -
    -

    域名目录（用户自定义url，可选）

    - micros.trustie.net/ -
    -
    -
      -
    • 栏目类型
      • -
    • - - -
      • -
    • - - -
      • -
    • -
    -
    - 确定 + +
    +

    域名目录（用户自定义url，可选）

    + <% if @organization.domain %> + <%= @organization.domain %>.trustie.net/ + <% else %> + 您还没有子域名，请先在左侧信息栏申请子域名 + <% end %> +
    +
    +
      +
    • 栏目类型
      • +
    • + + +
      • +
    • + + +
      • +
    • +
    +
    + 确定 <% end %>
    diff --git a/db/migrate/20160108093752_add_status_to_org_messages.rb b/db/migrate/20160108093752_add_status_to_org_messages.rb new file mode 100644 index 000000000..4fbe41fe1 --- /dev/null +++ b/db/migrate/20160108093752_add_status_to_org_messages.rb @@ -0,0 +1,5 @@ +class AddStatusToOrgMessages < ActiveRecord::Migration + def change + add_column :org_messages, :status, :integer, :default => 0 + end +end diff --git a/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb b/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb new file mode 100644 index 000000000..0ef66a94c --- /dev/null +++ b/db/migrate/20160112085834_create_subfield_subdomain_dirs.rb @@ -0,0 +1,9 @@ +class CreateSubfieldSubdomainDirs < ActiveRecord::Migration + def change + create_table :subfield_subdomain_dirs do |t| + t.integer :org_subfield_id + t.string :name + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b21b5057d..85eec4d85 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 => 20160108093752) do +ActiveRecord::Schema.define(:version => 20160112085834) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1656,6 +1656,13 @@ ActiveRecord::Schema.define(:version => 20160108093752) do add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id" add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id" + create_table "subfield_subdomain_dirs", :force => true do |t| + t.integer "org_subfield_id" + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "system_messages", :force => true do |t| t.integer "user_id" t.string "content" diff --git a/spec/factories/subfield_subdomain_dirs.rb b/spec/factories/subfield_subdomain_dirs.rb new file mode 100644 index 000000000..3a9878a82 --- /dev/null +++ b/spec/factories/subfield_subdomain_dirs.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :subfield_subdomain_dir do + + end + +end diff --git a/spec/models/subfield_subdomain_dir_spec.rb b/spec/models/subfield_subdomain_dir_spec.rb new file mode 100644 index 000000000..330a35c54 --- /dev/null +++ b/spec/models/subfield_subdomain_dir_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe SubfieldSubdomainDir, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 8ead573872e00b47a50f7b8b935bc6196be5fed2 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 13 Jan 2016 09:56:24 +0800 Subject: [PATCH 15/84] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=AE=BE=E7=BD=AEurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_subfields_controller.rb | 23 +++++++++++-------- app/views/org_subfields/create.js.erb | 18 +++++++++------ .../organizations/_subfield_list.html.erb | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index df81ccaff..3f781c4cc 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -1,16 +1,21 @@ class OrgSubfieldsController < ApplicationController def create - @subfield = OrgSubfield.create(:name => params[:name]) - @organization = Organization.find(params[:organization_id]) - @organization.org_subfields << @subfield - if !params[:sub_dir].blank? - sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+ - "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'" - if SubfieldSubdomainDir.find_by_sql(sql).count == 0 - SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir]) + if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0 + @res = true + @subfield = OrgSubfield.create(:name => params[:name]) + @organization = Organization.find(params[:organization_id]) + @organization.org_subfields << @subfield + if !params[:sub_dir].blank? + sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+ + "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'" + if SubfieldSubdomainDir.find_by_sql(sql).count == 0 + SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir]) + end end + @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type]) + else + @res = false end - @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type]) end def show diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb index 345c8f60f..61ac95f71 100644 --- a/app/views/org_subfields/create.js.erb +++ b/app/views/org_subfields/create.js.erb @@ -1,7 +1,11 @@ -$("#org_subfield_list").html(""); -$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', - :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"), - :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>"); -$("#sub_field_left_lists").html(""); -$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>"); -$("#subfield_name").val(""); \ No newline at end of file +<% if @res %> + $("#org_subfield_list").html(""); + $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list', + :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"), + :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>"); + $("#sub_field_left_lists").html(""); + $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>"); + $("#subfield_name").val(""); +<% else %> + $("#subfield_name").val(""); +<% end %> \ No newline at end of file diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index b8af1e85e..19e9eb3c2 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -27,7 +27,7 @@
  • 新增
  • <%= field.field_type == "Post" ? "帖子" : "资源" %>
    • - + <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %> <%= field.hide==0?"设为隐藏":"设为可见" %> <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %> From e04926f2e798fd1e4256a093d8053e79860f97c8 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 13 Jan 2016 10:04:42 +0800 Subject: [PATCH 16/84] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_course_homework.html.erb | 2 +- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_user_homework_detail.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 4f2a7b662..564b27b35 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -173,7 +173,7 @@ <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>

    <%=(User.find project.user_id).show_name %>(组长)

    -

    <%=time_from_now time %>

    +

    <%=time_from_now time %>  <%=changesets_num project %>提交

    项目名称：<%=project.name %>
    创建者：<%=(User.find project.user_id).show_name %>(组长)
    diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 7c6959935..793f5ba39 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -173,7 +173,7 @@ <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>

    <%=(User.find project.user_id).show_name %>(组长)

    -

    <%=time_from_now time %>

    +

    <%=time_from_now time %>  <%=changesets_num project %>提交

    项目名称：<%=project.name %>
    创建者：<%=(User.find project.user_id).show_name %>(组长)
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 85e426e92..05077eb26 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -174,7 +174,7 @@ <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>

    <%=(User.find project.user_id).show_name %>(组长)

    -

    <%=time_from_now time %>

    +

    <%=time_from_now time %>  <%=changesets_num project %>提交

    项目名称：<%=project.name %>
    创建者：<%=(User.find project.user_id).show_name %>(组长)
    From 64088f5a212fe49584ce36bb32688dea41f3a264 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 10:08:48 +0800 Subject: [PATCH 17/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=98=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=88=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=9B=B4=E6=8E=A5=E4=BB=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 17 ++++++++-------- app/models/attachment.rb | 11 +++++++++- app/models/forge_activity.rb | 19 ++++++++++++++++-- app/models/message.rb | 20 +++++++++++++++++-- app/models/news.rb | 16 +++++++++++++-- app/views/layouts/base_projects.html.erb | 17 ++++++++-------- .../projects/_development_group.html.erb | 16 +++++++-------- app/views/projects/_friend_group.html.erb | 12 +++++------ app/views/projects/_research_team.html.erb | 16 +++++++-------- 9 files changed, 98 insertions(+), 46 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 59b0f6f03..1506061b2 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -17,14 +17,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class FilesController < ApplicationController - - layout 'base_projects' #by young + layout 'base_projects' #by young menu_item :files before_filter :auth_login1, :only => [:index] before_filter :logged_user_by_apptoken,:only => [:index] before_filter :find_project_by_project_id#, :except => [:getattachtype] - before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield] + before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file, + :search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield] helper :sort include SortHelper @@ -450,6 +450,9 @@ class FilesController < ApplicationController end end end + # 更新资源总数, 根据上传的附件数累加 + @project.update_attribute(:attachments_count, @project.attachments_count + attachments[:files].count) + # end # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", @@ -478,9 +481,6 @@ class FilesController < ApplicationController if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') Mailer.run.attachments_added(attachments[:files]) end - # 更新课程英雄榜得分 - update_contributor_score(@course, attachments[:files].first) - # end if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array) params[:course_attachment_type].each do |type| tag_name = get_tag_name_by_type_number type @@ -502,8 +502,9 @@ class FilesController < ApplicationController end end end - - + # 更新课程英雄榜得分 + update_contributor_score(@course, attachments[:files].first) + # end # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/models/attachment.rb b/app/models/attachment.rb index d90b0368e..3088714ee 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -90,7 +90,7 @@ class Attachment < ActiveRecord::Base before_save :files_to_final_location,:act_as_course_activity after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index - after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index + after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index#, :decrease_attchments_count # add by nwb # 获取所有可公开的资源文件列表 @@ -617,6 +617,7 @@ class Attachment < ActiveRecord::Base self.__elasticsearch__.index_document end end + def update_attachment_ealasticsearch_index if self.is_public == 1 && ( ((self.container_type == 'Project' or self.container_type == 'Version') && Project.find(self.container_id).is_public == 1) || ( self.container_type == 'Course' && Course.find(self.container_id).is_public == 1) || @@ -632,12 +633,20 @@ class Attachment < ActiveRecord::Base end end end + def delete_attachment_ealasticsearch_index begin self.__elasticsearch__.delete_document rescue => e end end + + # def decrease_attchments_count + # if self.container_type == "Project" + # count = self.container.attachments_count + # #self.container.update_attribute(:attachments_count, self.container.attachments_count - 1) + # end + # end end # Delete the previous articles index in Elasticsearch diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index c98c5475b..310d194a0 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -20,8 +20,8 @@ class ForgeActivity < ActiveRecord::Base validates :forge_act_id,presence: true validates :forge_act_type, presence: true has_many :user_acts, :class_name => 'UserAcivity',:as =>:act - after_save :add_user_activity, :add_org_activity - before_destroy :destroy_user_activity, :destroy_org_activity + after_save :add_user_activity, :add_org_activity, :add_acts_count + before_destroy :destroy_user_activity, :destroy_org_activity, :decrease_acts_count #在个人动态里面增加当前动态 def add_user_activity @@ -45,6 +45,21 @@ class ForgeActivity < ActiveRecord::Base end end + # 更新动态数 + def add_acts_count + if self.project + count = self.project.acts_count + 1 + self.project.update_attribute(:acts_count, count) + end + end + + def decrease_acts_count + if self.project + count = self.project.acts_count - 1 + self.project.update_attribute(:acts_count, count) + end + end + def add_org_activity org_activity = OrgActivity.where("org_act_type = '#{self.forge_act_type.to_s}' and org_act_id = #{self.forge_act_id}").first if org_activity diff --git a/app/models/message.rb b/app/models/message.rb index 3bb08f481..1d3ae7681 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -74,9 +74,9 @@ class Message < ActiveRecord::Base validates_length_of :subject, :maximum => 255 validate :cannot_reply_to_locked_topic, :on => :create - after_create :add_author_as_watcher, :reset_counters! + after_create :add_author_as_watcher, :reset_counters!, :add_boards_count after_update :update_messages_board - after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets + after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message #before_save :be_user_score @@ -125,6 +125,14 @@ class Message < ActiveRecord::Base end end + # 发帖精辟更新发帖总数 + def add_boards_count + if self.parent_id.nil? + count = self.project.boards_count + 1 + self.project.update_attribute(:boards_count, count) + end + end + def reset_counters! if parent && parent.id Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id}) @@ -303,6 +311,14 @@ class Message < ActiveRecord::Base delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE end + # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 + def decrease_boards_count + if self.parent_id.nil? + count = self.project.boards_count - 1 + self.project.update_attribute(:boards_count, count) + end + end + # 课程成员得分（英雄榜） def act_as_student_score if self.course diff --git a/app/models/news.rb b/app/models/news.rb index a7407c91f..807206f40 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -55,9 +55,9 @@ class News < ActiveRecord::Base :author_key => :author_id acts_as_watchable - after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail + after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count - after_destroy :delete_kindeditor_assets + after_destroy :delete_kindeditor_assets, :decrease_news_count scope :visible, lambda {|*args| includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args)) @@ -107,10 +107,17 @@ class News < ActiveRecord::Base end private + def add_news_count + if self.project + count = self.project.news_count + 1 + self.project.update_attribute(:news_count, count) + end + end def add_author_as_watcher Watcher.create(:watchable => self, :user => author) end + ## fq def act_as_activity self.acts << Activity.new(:user_id => self.author_id) @@ -161,6 +168,11 @@ class News < ActiveRecord::Base delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::NEWS end + def decrease_news_count + count = self.project.news_count - 1 + self.project.update_attribute(:news_count, count) + end + def send_mail Mailer.run.news_added(self) if Setting.notified_events.include?('news_added') end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 6716a3aaa..90ac0291a 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -91,12 +91,11 @@ <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>） |  <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>） - <% attaments_num = @project.attachments.count %> <% unless @project.enabled_modules.where("name = 'files'").empty? %> |  <%= l(:project_module_attachments) %>（ - <% attaments_num %> - <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue', :id=>'project_files_count_info' %>） + <% @project.attachments_count %> + <%= link_to "#{@project.attachments_count}", project_files_path(@project), :class => 'info_foot_num c_blue', :id=>'project_files_count_info' %>） <% end %>
    @@ -120,11 +119,11 @@
    <% if @project.project_new_type == 1 || @project.project_new_type.nil? %> - <%= render :partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/development_group', :locals => {:project => @project} %> <% elsif @project.project_new_type == 2 %> - <%= render :partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/research_team', :locals => {:project => @project} %> <% else %> - <%= render :partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num} %> + <%= render :partial => 'projects/friend_group', :locals => {:project => @project} %> <% end %>
    @@ -213,19 +212,19 @@ if(data == 1) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('development_group');"); } else if(data == 2) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('research_group');"); } else if(data == 3) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>"); - $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group', :locals => {:project => @project})) %>'); $("#close_light").attr("onClick","close_window('friend_organization');"); } else diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 47a1f2a94..0c33f70a6 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -1,14 +1,14 @@
    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
    <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
    <%= link_to l(:label_issue_tracking), project_issues_path(@project, :remote => true), :class => "f14 c_blue02" %> - <% if (issue_count = @project.issues.count) > 0 %> - (<%= issue_count %>) + <% if @project.issues_count > 0 %> + (<%= @project.issues_count %>) <% end %> <% if User.current.member_of?(@project) %> @@ -19,8 +19,8 @@ <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
    <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -30,8 +30,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
    <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> diff --git a/app/views/projects/_friend_group.html.erb b/app/views/projects/_friend_group.html.erb index bce920780..1e29c7552 100644 --- a/app/views/projects/_friend_group.html.erb +++ b/app/views/projects/_friend_group.html.erb @@ -1,14 +1,14 @@
    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
    <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
    <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -18,8 +18,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
    <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb index 128d5e827..2c5fb67c7 100644 --- a/app/views/projects/_research_team.html.erb +++ b/app/views/projects/_research_team.html.erb @@ -1,14 +1,14 @@
    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% unless @project.acts_count == 0 %> + (<%= @project.acts_count %>) <% end %>
    <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
    <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> - <% if (issue_count = @project.issues.count) > 0 %> - (<%= issue_count %>) + <% if @project.issues_count > 0 %> + (<%= @project.issues_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> @@ -18,8 +18,8 @@ <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
    <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) + <% unless @project.boards_count == 0 %> + (<%= @project.boards_count %>) <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> @@ -29,8 +29,8 @@ <% unless @project.enabled_modules.where("name = 'files'").empty? %>
    <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - <%= link_to "(#{attaments_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <% unless @project.attachments_count == 0 %> + <%= link_to "(#{@project.attachments_count})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> <% if User.current.member_of?(@project) %> <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> From 5519ef78e2b5206b33792656bd8e92368dfd0763 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 10:18:19 +0800 Subject: [PATCH 18/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=8C=BA?= =?UTF-8?q?=E5=88=86project=E5=92=8Ccourse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 4 ++-- app/models/news.rb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/message.rb b/app/models/message.rb index 1d3ae7681..c43657aa5 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -127,7 +127,7 @@ class Message < ActiveRecord::Base # 发帖精辟更新发帖总数 def add_boards_count - if self.parent_id.nil? + if self.project && self.parent_id.nil? count = self.project.boards_count + 1 self.project.update_attribute(:boards_count, count) end @@ -313,7 +313,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count - if self.parent_id.nil? + if self.project && self.parent_id.nil? count = self.project.boards_count - 1 self.project.update_attribute(:boards_count, count) end diff --git a/app/models/news.rb b/app/models/news.rb index 807206f40..14e570286 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -169,8 +169,10 @@ class News < ActiveRecord::Base end def decrease_news_count - count = self.project.news_count - 1 - self.project.update_attribute(:news_count, count) + if self.project + count = self.project.news_count - 1 + self.project.update_attribute(:news_count, count) + end end def send_mail From a0ceb9b11c4564afb9ec7accc1c4373fdc1b9718 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 12:53:09 +0800 Subject: [PATCH 19/84] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=BB=9F=E8=AE=A1=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=8F=90=E4=BA=A4=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal.rb | 20 +++++++++++++++++-- .../20160111071411_static_project_issues.rb | 6 ++++-- ...113023045_add_journals_count_to_project.rb | 5 +++++ .../20160113023137_statics_issue_journal.rb | 12 +++++++++++ ...160113024927_statics_repository_commits.rb | 19 ++++++++++++++++++ db/schema.rb | 3 ++- 6 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20160113023045_add_journals_count_to_project.rb create mode 100644 db/migrate/20160113023137_statics_issue_journal.rb create mode 100644 db/migrate/20160113024927_statics_repository_commits.rb diff --git a/app/models/journal.rb b/app/models/journal.rb index e1464a703..62f0d1d69 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -48,14 +48,14 @@ class Journal < ActiveRecord::Base :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" + "(#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"} - before_create :split_private_notes + before_create :split_private_notes, :add_journals_count # fq after_save :act_as_activity,:be_user_score, :act_as_forge_message, :act_as_at_message # end #after_destroy :down_user_score #before_save :be_user_score - after_destroy :down_user_score + after_destroy :down_user_score, :decrease_issues_journal_count scope :visible, lambda {|*args| user = args.shift || User.current @@ -214,4 +214,20 @@ class Journal < ActiveRecord::Base end end + + # 减少留言数量统计 + def decrease_issues_journal_count + unless self.issue.project.nil? + project = self.issue.project + project.update_attribute(:journals_count, project.journals_count - 1) + end + end + + # issue留言总数更新 + def add_journals_count + unless self.issue.project.nil? && self.journalized_type == "Issue" + project = self.issue.project + project.update_attribute(:journals_count, project.journals_count + 1) + end + end end diff --git a/db/migrate/20160111071411_static_project_issues.rb b/db/migrate/20160111071411_static_project_issues.rb index d9a3a24ff..96c6d7acb 100644 --- a/db/migrate/20160111071411_static_project_issues.rb +++ b/db/migrate/20160111071411_static_project_issues.rb @@ -1,8 +1,10 @@ class StaticProjectIssues < ActiveRecord::Migration def up Project.all.each do |project| - issues_count = project.issues.count - project.update_attribute(:issues_count, issues_count) + unless project.issues.nil? + issues_count = project.issues.count + project.update_attribute(:issues_count, issues_count) + end end end diff --git a/db/migrate/20160113023045_add_journals_count_to_project.rb b/db/migrate/20160113023045_add_journals_count_to_project.rb new file mode 100644 index 000000000..9548f49c4 --- /dev/null +++ b/db/migrate/20160113023045_add_journals_count_to_project.rb @@ -0,0 +1,5 @@ +class AddJournalsCountToProject < ActiveRecord::Migration + def change + add_column :projects, :journals_count, :integer, :default => false + end +end diff --git a/db/migrate/20160113023137_statics_issue_journal.rb b/db/migrate/20160113023137_statics_issue_journal.rb new file mode 100644 index 000000000..ef54c04be --- /dev/null +++ b/db/migrate/20160113023137_statics_issue_journal.rb @@ -0,0 +1,12 @@ +class StaticsIssueJournal < ActiveRecord::Migration + def up + Project.all.each do |project| + if !project.project_score.nil? && !project.project_score.issue_journal_num.nil? + project.update_attribute(:journals_count, project.project_score.issue_journal_num) + end + end + end + + def down + end +end diff --git a/db/migrate/20160113024927_statics_repository_commits.rb b/db/migrate/20160113024927_statics_repository_commits.rb new file mode 100644 index 000000000..66fa896af --- /dev/null +++ b/db/migrate/20160113024927_statics_repository_commits.rb @@ -0,0 +1,19 @@ +class StaticsRepositoryCommits < ActiveRecord::Migration + def up + g = Gitlab.client + Project.all.each do |project| + unless project.gpid.nil? + begin + puts project.id + count = g.project(project.gpid).commit_count + rescue + logger.error("The project's rep is not exit!") + end + project.update_attribute(:commits_count, count) + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 6197c2c76..0009b881e 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 => 20160111080914) do +ActiveRecord::Schema.define(:version => 20160113023137) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1416,6 +1416,7 @@ ActiveRecord::Schema.define(:version => 20160111080914) do t.integer "boards_count", :default => 0 t.integer "news_count", :default => 0 t.integer "acts_count", :default => 0 + t.integer "journals_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" From cf7130a3983c74ebc670e1e83f4bd3fbb9d80bdd Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 12:57:09 +0800 Subject: [PATCH 20/84] 0 --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 0009b881e..72a6bef89 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 => 20160113023137) do +ActiveRecord::Schema.define(:version => 20160113024927) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false From 6cfda615d6b77144b71f3245b5996a3f04dea62e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 13 Jan 2016 15:17:13 +0800 Subject: [PATCH 21/84] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9Bbug?= =?UTF-8?q?;2.=E7=BB=84=E7=BB=87=E5=AD=90=E7=9B=AE=E5=BD=95=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 --- .../subfield_subdomain_dirs.js.coffee | 3 + .../subfield_subdomain_dirs.css.scss | 3 + app/controllers/org_subfields_controller.rb | 61 ++++++++++++++----- app/controllers/projects_controller.rb | 8 +++ .../subfield_subdomain_dirs_controller.rb | 10 +++ app/helpers/subfield_subdomain_dirs_helper.rb | 2 + app/models/org_subfield.rb | 2 +- app/views/courses/private_or_public.js.erb | 20 +++--- app/views/files/_subfield_files.html.erb | 51 +--------------- app/views/layouts/_user_courses.html.erb | 12 ++-- app/views/layouts/_user_projects.html.erb | 19 ++++-- app/views/org_subfields/show.html.erb | 59 ------------------ app/views/org_subfields/update_sub_dir.js.erb | 10 +++ .../_org_left_subfield_list.html.erb | 6 +- .../organizations/_subfield_list.html.erb | 31 +++++++++- .../projects/set_public_or_private.js.erb | 1 + .../subfield_subdomain_dirs/update.js.erb | 1 + config/routes.rb | 9 ++- ...subfield_subdomain_dirs_controller_spec.rb | 5 ++ 19 files changed, 165 insertions(+), 148 deletions(-) create mode 100644 app/assets/javascripts/subfield_subdomain_dirs.js.coffee create mode 100644 app/assets/stylesheets/subfield_subdomain_dirs.css.scss create mode 100644 app/controllers/subfield_subdomain_dirs_controller.rb create mode 100644 app/helpers/subfield_subdomain_dirs_helper.rb create mode 100644 app/views/org_subfields/update_sub_dir.js.erb create mode 100644 app/views/projects/set_public_or_private.js.erb create mode 100644 app/views/subfield_subdomain_dirs/update.js.erb create mode 100644 spec/controllers/subfield_subdomain_dirs_controller_spec.rb diff --git a/app/assets/javascripts/subfield_subdomain_dirs.js.coffee b/app/assets/javascripts/subfield_subdomain_dirs.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/subfield_subdomain_dirs.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/subfield_subdomain_dirs.css.scss b/app/assets/stylesheets/subfield_subdomain_dirs.css.scss new file mode 100644 index 000000000..6843d92f8 --- /dev/null +++ b/app/assets/stylesheets/subfield_subdomain_dirs.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the subfield_subdomain_dirs controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 3f781c4cc..465bf1208 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -1,4 +1,5 @@ class OrgSubfieldsController < ApplicationController + layout 'base_org' def create if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0 @res = true @@ -20,13 +21,12 @@ class OrgSubfieldsController < ApplicationController def show @organization = Organization.find(params[:id]) - @subfield = @organization.org_subfields.first - if @subfield.field_type == 'Post' - redirect_to organization_path(@organization, :org_subfield_id => @subfield.id) - end @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+ "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+ - " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name=#{params[:name]}").first + " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:name]}'").first + if @org_subfield.field_type == 'Post' + redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id) + end if params[:sort] params[:sort].split(",").each do |sort_type| order_by = sort_type.split(":") @@ -74,17 +74,9 @@ class OrgSubfieldsController < ApplicationController show_attachments @containers @tag_list = attachment_tag_list @all_attachments @page = params[:page] || 1 - render :layout => 'base_org' - # @org_subfield = OrgSubfield.find(params[:id]) - # @organization = @org_subfield.organization.id - # @messages = [] - # @messages << @org_subfield.org_document_comments - # @messages << @org_subfield.messages - # @messages.sort{|a, b| b.updated_at <=> a.updated_at} - # respond_to do |format| - # format.html{render :layout => 'base_org'} - # end + #render :layout => 'base_org' end + def destroy @subfield = OrgSubfield.find(params[:id]) @organization = Organization.find(@subfield.organization_id) @@ -97,4 +89,43 @@ class OrgSubfieldsController < ApplicationController @subfield.update_attributes(:name => params[:name]) end + def update_sub_dir + @org_subfield = OrgSubfield.find(params[:id]) + sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+ + "and org_subfields.organization_id=#{@org_subfield.organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'" + if SubfieldSubdomainDir.find_by_sql(sql).count == 0 + if @org_subfield.subfield_subdomain_dir + @sub_dir = @org_subfield.subfield_subdomain_dir + @sub_dir.update_attribute(:name, params[:sub_dir_name]) + else + @sub_dir = SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir_name]) + end + @exist = false + else + @exist = true + end + end + + def show_attachments obj + @attachments = [] + obj.each do |container| + @attachments += container.attachments + end + @all_attachments = User.current.admin? ? @attachments : visable_attachemnts(@attachments) + @limit = 10 + @feedback_count = @all_attachments.count + @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] + @offset ||= @feedback_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @obj_attachments = paginateHelper @all_attachments,10 + end + + #获取指定资源列表的TAG的集合以及每个TAG的数量，降序排序 + def attachment_tag_list attachments + tag_list = Hash.new + attachments.each do |attachment| + attachment.tag_list.map{|tag| tag_list.has_key?(tag) ? tag_list[tag] = tag_list[tag] + 1 : tag_list[tag] = 1} + end + tag_list.sort {|a,b| b[1]<=>a[1]} + end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 31c70e92a..708fbf6cb 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -512,6 +512,14 @@ class ProjectsController < ApplicationController def edit end + def set_public_or_private + @project = Project.find(params[:id]) + if @project.is_public? + @project.update_attribute(:is_public, 0) + else + @project.update_attribute(:is_public, 1) + end + end # by young # include CoursesHelper def member diff --git a/app/controllers/subfield_subdomain_dirs_controller.rb b/app/controllers/subfield_subdomain_dirs_controller.rb new file mode 100644 index 000000000..90c6a7a92 --- /dev/null +++ b/app/controllers/subfield_subdomain_dirs_controller.rb @@ -0,0 +1,10 @@ +class SubfieldSubdomainDirsController < ApplicationController + def update + @org_subfield = OrgSubfield.find(params[:org_subfield_id]) + if @org_subfield.subfield_subdomain_dir + @org_subfield.subfield_subdomain_dir.update_attribute(:name, :params[:sub_dir_name]) + else + SubfieldSubdomainDir.create(:org_subfield_id => @org_subfield.id, :name => params[:sub_dir_name]) + end + end +end diff --git a/app/helpers/subfield_subdomain_dirs_helper.rb b/app/helpers/subfield_subdomain_dirs_helper.rb new file mode 100644 index 000000000..584de578c --- /dev/null +++ b/app/helpers/subfield_subdomain_dirs_helper.rb @@ -0,0 +1,2 @@ +module SubfieldSubdomainDirsHelper +end diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb index 146323a32..b109ba042 100644 --- a/app/models/org_subfield.rb +++ b/app/models/org_subfield.rb @@ -1,6 +1,6 @@ class OrgSubfield < ActiveRecord::Base belongs_to :organization, :foreign_key => :organization_id - has_one :subfield_subdomain_dir + has_one :subfield_subdomain_dir,:dependent => :destroy has_many :org_document_comments, :dependent => :destroy has_many :files has_many :org_subfield_messages, :dependent => :destroy diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb index 71315e910..1ff81d4ae 100644 --- a/app/views/courses/private_or_public.js.erb +++ b/app/views/courses/private_or_public.js.erb @@ -1,8 +1,12 @@ -$("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>'); -if(document.getElementById("course_is_public")) { - <% if @course.is_public == 0%> - $("#course_is_public").attr("checked",false); - <% elsif @course.is_public == 1 %> - $("#course_is_public").attr("checked",true); - <% end %> -} \ No newline at end of file +<% if params[:user_page].nil? %> + $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>'); + if(document.getElementById("course_is_public")) { + <% if @course.is_public == 0%> + $("#course_is_public").attr("checked",false); + <% elsif @course.is_public == 1 %> + $("#course_is_public").attr("checked",true); + <% end %> + } +<% else %> + location.reload(); +<% end %> \ No newline at end of file diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb index 15d7f4cff..1a222780e 100644 --- a/app/views/files/_subfield_files.html.erb +++ b/app/views/files/_subfield_files.html.erb @@ -11,58 +11,11 @@ } }); } - function show_upload(obj) - { - switch(obj) - { -// case 1: -// $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>'); -// break; - case 2: - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>'); - break; - case 3: - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 3}) %>'); - break; - case 4: - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>'); - break; -// case 6: -// $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>'); -// break; - default: - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>'); - } - showModal('ajax-modal', '513px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","").css("left",""); - $('#ajax-modal').parent().addClass("popbox_polls"); - } function closeModal() { hideModal($("#popbox_upload")); } -// -// function presscss(id) -// { -// if(id == "inorg_subfield") -// { -// $('#inorg_subfield').attr("class", "re_schbtn b_dblue"); -// $('#insite').attr("class", "re_schbtn b_lblue"); -// } -// else -// { -// $('#inorg_subfield').attr("class", "re_schbtn b_lblue"); -// $('#insite').attr("class", "re_schbtn b_dblue"); -// } -// } -// function buttoncss() -// { -// $('#inorg_subfield').attr("class", "re_schbtn b_lblue"); -// $('#insite').attr("class", "re_schbtn b_lblue"); -// }
    @@ -97,7 +50,7 @@
    - <%= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%> + <%#= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>

    共有 <%= @all_attachments.count %> 个资源

    @@ -117,7 +70,7 @@
    - <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments} %> + <%= render :partial => 'files/org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments} %>
    diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index a8a56b3c5..3d60a2727 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -1,7 +1,7 @@ <% courses.each do |course|%>
  • <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", - :title => (course.is_public ? "公有课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%> + :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%> <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
    • @@ -13,12 +13,12 @@
    • <%= link_to "通知", course_news_index_path(course), :class => 'fl',:target => '_blank' %> - <%= link_to "+", course_news_index_path(course), :class => 'fr fb', :title => '发布通知',:target => '_blank' %> + <%= link_to "+", new_course_news_path(course,:is_new=>1), :class => 'fr fb', :title => '发布通知',:target => '_blank' %>
    • - <%= link_to "资源",course_files_path(course), :remote => true, :class => 'fl' %> - <%= link_to "+",upload_files_menu_path(:course_id => course.id), :class => 'fr fb', :title => '上传资源' %> + <%= link_to "资源",course_files_path(course), :class => 'fl',:target => '_blank' %> + <%= link_to "+",upload_files_menu_path(:course_id => course.id), :class => 'fr fb',:remote => true, :title => '上传资源' %>
    • @@ -31,13 +31,13 @@ <% if count == 0 %> <%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :course_id => course.id), :method => 'post',:remote => true %> <% else %> - <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :course_id => course.id),:remote => true %> + <%= link_to "显示动态", show_acts_shield_activities_path(:user_id => user.id, :course_id => course.id),:remote => true,:method => 'delete' %> <% end %>
      • <% end %> <% if User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
    • - <%= link_to course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => course}, + <%= link_to course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => course,:user_page => true}, :remote=>true,:confirm=>"您确定要设置为"+(course.is_public == 0 ? "公开" : "私有")+"吗"%>
      • diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index f822021e0..aa38bb51a 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,28 +1,28 @@ <% projects.each do |project|%>
    • <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %> - <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%> + <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
        • - <%=link_to "问题跟踪", new_project_issue_path(project), :class => 'fl fontGrey2', :target => '_blank',:style => "width:48px;" %> + <%=link_to "问题跟踪", project_issues_path(project), :class => 'fl fontGrey2', :target => '_blank',:style => "width:48px;" %> <%=link_to "+", new_project_issue_path(project), :class => 'fr fb', :target => '_blank',:style => "width:48px;", :title => '发布问题',:style =>'width:10px;' %>
        • - <%=link_to "资源", upload_files_menu_path(:project_id => project.id),:remote => true,:class => 'fl fontGrey2' %> + <%=link_to "资源", project_files_path(project),:remote => true,:class => 'fl fontGrey2' %> <%=link_to "+", upload_files_menu_path(:project_id => project.id),:remote => true,:class => 'fr fb',:title => '上传资源'%>
        • - <%=link_to "论坛", project_boards_path(project, :flag => true),:remote => true,:class => 'fl fontGrey2', :target => '_blank'%> - <%=link_to "+", project_boards_path(project, :flag => true),:remote => true,:class => 'fr fb', :target => '_blank',:title => '发布帖子'%> + <%=link_to "论坛", project_boards_path(project),:class => 'fl fontGrey2', :target => '_blank'%> + <%=link_to "+", project_boards_path(project, :flag => true),:class => 'fr fb', :target => '_blank',:title => '发布帖子'%>
          • <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, project)) && rep_is_gitlab?(project) %>
        • - <%= link_to '版本库', url_for(:controller => 'projects', :action => 'settings', :id => project.id, :tab=>'repositories') , :target => '_blank',:class => "fl",:title => '新建版本库' %> + <%= link_to '版本库', url_for(:controller => 'projects', :action => 'settings', :id => project.id, :tab=>'repositories') , :target => '_blank',:class => "fl",:title => '版本库' %>
          • <% end %> @@ -36,6 +36,13 @@
          <% end %> + <% if User.current.logged? && (User.current.admin? || is_project_manager?(User.current,project)) %> +
        • + <%= link_to project.is_public? ? "设为私有" : "设为公开", {:controller => 'projects', :action => 'set_public_or_private', :id => project.id,:user_page => true}, + :method => 'post',:remote=>true,:confirm=>"您确定要设置为"+(project.is_public? ? "私有" : "公开")+"吗"%> +
          +
          • + <% end %>
      diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb index 660322c29..40ad1cafb 100644 --- a/app/views/org_subfields/show.html.erb +++ b/app/views/org_subfields/show.html.erb @@ -55,7 +55,6 @@ } } - function attachment_contenttypes_searchex(value) { <% if @project%> $.ajax({ @@ -70,8 +69,6 @@ <%end%> } - - function attachtype_edit(value) { <% if @project%> $.ajax({ @@ -87,62 +84,6 @@ <%end%> } - function attachmenttypes_searchex(value) { - <% if @project%> - $.ajax({ - url: '<%=getattachtype_project_files_path(project_id: @project)%>', - type: "POST", - data: { - type: encodeURIComponent(value), - contentType: $('#attach_sufix_browse').val() - } - - }).complete(eval_ajax); - <%end%> - } - - function course_attachmenttypes_searchex(value) { - <% if @course%> - $.ajax({ - url: '<%=getattachtype_course_files_path(course_id: @course)%>', - type: "POST", - data: { - type: encodeURIComponent(value), - contentType: $('#attach_sufix_browse').val() - } - - }).complete(eval_ajax); - <%end%> - } - - function course_attachment_contenttypes_searchex(value) { - <% if @course%> - $.ajax({ - - url: '<%=getattachtype_course_files_path(course_id: @course)%>', - type: "POST", - data: { - type: $('#attachment_browse').val(), - contentType: encodeURIComponent(value) - } - - }).complete(eval_ajax); - <%end%> - } - function course_attachtype_edit(value) { - <% if @course%> - $.ajax({ - url: '<%=getattachtype_course_files_path(course_id: @course)%>', - type: "POST", - data: { - type: $('#attachment_browse').val(), - contentType: encodeURIComponent(value) - } - - }).complete(eval_ajax); - <%end%> - } - function attachmenttypes_change(id, type) { <% if @project%> $.ajax({ diff --git a/app/views/org_subfields/update_sub_dir.js.erb b/app/views/org_subfields/update_sub_dir.js.erb new file mode 100644 index 000000000..963c55100 --- /dev/null +++ b/app/views/org_subfields/update_sub_dir.js.erb @@ -0,0 +1,10 @@ +<%# if @exist == false %> + $('#sub_dir_show_<%= @org_subfield.id %>').html('<%= @sub_dir.name %>'); + $('#sub_dir_edit_<%= @org_subfield.id %>').find('input').val('<%= @sub_dir.name %>'); + $('#sub_dir_show_<%= @org_subfield.id %>').show(); + $('#sub_dir_edit_<%= @org_subfield.id %>').hide(); +<%# else %> +// alert("该目录已存在，请重新输入"); +// $('#sub_dir_edit_<%#= @org_subfield.id %>').find('input').val('<%#= @org_subfield.subfield_subdomain_dir.nil? ? "未设置":@org_subfield.subfield_subdomain_dir.name %>'); +// $('#sub_dir_edit_<%= @org_subfield.id %>').focus(); +<%# end %> \ No newline at end of file diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index e0602e1c9..884364c8a 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -75,7 +75,11 @@ <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%> <% end %> <% else %> - <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :name => field.name), :class => "homepageMenuText" %> + <% if !field.subfield_subdomain_dir.nil? %> + <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %> + <% else %> + <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %> + <% end %> <% if User.current.member_of_org?organization %> <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %> diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 19e9eb3c2..36f0a1294 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -27,7 +27,12 @@
    • 新增
    • <%= field.field_type == "Post" ? "帖子" : "资源" %>
      • - + <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %> <%= field.hide==0?"设为隐藏":"设为可见" %> <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %> @@ -61,6 +66,28 @@ // $(edit_id).focus(); } + function edit_dir(show_id, edit_id){ + $(show_id).toggle(); + $(edit_id).toggle(); + $(edit_id).find('input').focus(); + $(edit_id).find('input').on('keypress', function(e){ + if (e.keyCode == 13){ + this.blur(); + } + }); + } + + function update_sub_dir(show_id, edit_id, field_id, input_value) { + if ($(show_id).html().trim() != input_value.trim()) { + if (confirm('确定修改为' + input_value + "?")) + $.ajax({ + url: "/org_subfields/" + field_id + "/update_sub_dir?sub_dir_name=" + input_value, + type: 'put' + }); + } + $(show_id).show(); + $(edit_id).hide(); + } function hide(content, id){ if (content.text() == '设为隐藏') $.ajax({ @@ -73,4 +100,4 @@ type: "post" }); } - \ No newline at end of file + diff --git a/app/views/projects/set_public_or_private.js.erb b/app/views/projects/set_public_or_private.js.erb new file mode 100644 index 000000000..bcebe9d37 --- /dev/null +++ b/app/views/projects/set_public_or_private.js.erb @@ -0,0 +1 @@ +location.reload(); \ No newline at end of file diff --git a/app/views/subfield_subdomain_dirs/update.js.erb b/app/views/subfield_subdomain_dirs/update.js.erb new file mode 100644 index 000000000..97d8a6dee --- /dev/null +++ b/app/views/subfield_subdomain_dirs/update.js.erb @@ -0,0 +1 @@ +$("#sub_dir_show_<%= @org_subfield.id %>").html("<%= @org_subfield.subfield_subdomain_dir.name %>"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 1f04f65d5..24c17e997 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,7 +74,10 @@ RedmineApp::Application.routes.draw do end Organization.where("domain is not null").each do |org| - get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain} + org_domains = [] + org_domains << org.domain + #get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain} + get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: lambda{ |request| org_domains.include?(request.remote_ip) } end get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'} get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'} @@ -102,6 +105,9 @@ RedmineApp::Application.routes.draw do match "quote_resource_show_org_subfield", :via => [:get] end end + member do + match 'update_sub_dir', :via => [:put] + end resource :boards end @@ -631,6 +637,7 @@ RedmineApp::Application.routes.draw do post 'reopen' get 'search_public_orgs_not_in_project' match 'copy', :via => [:get, :post] + match 'set_public_or_private', :via => [:post] end collection do diff --git a/spec/controllers/subfield_subdomain_dirs_controller_spec.rb b/spec/controllers/subfield_subdomain_dirs_controller_spec.rb new file mode 100644 index 000000000..70160c0f0 --- /dev/null +++ b/spec/controllers/subfield_subdomain_dirs_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe SubfieldSubdomainDirsController, :type => :controller do + +end From 05cf2d24dc18f5ad69896b3aae86d9933fa1afe9 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 15:29:29 +0800 Subject: [PATCH 22/84] =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E7=B3=BB=E7=BB=9F=20=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=8A=A0=E5=85=A5=E5=BE=97=E5=88=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20=E7=89=88=E6=9C=AC=E5=BA=93=E8=A1=8C=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=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/helpers/application_helper.rb | 6 +++++ app/models/message.rb | 22 ++++++++++++++----- app/views/layouts/base_projects.html.erb | 11 +++++----- ...113063514_add_messages_count_to_project.rb | 5 +++++ .../20160113064153_statics_boards_reply.rb | 14 ++++++++++++ db/schema.rb | 3 ++- public/stylesheets/scm.css | 1 + 7 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20160113063514_add_messages_count_to_project.rb create mode 100644 db/migrate/20160113064153_statics_boards_reply.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4fcb43172..4b7820037 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -49,6 +49,12 @@ module ApplicationHelper end end + # 获取项目/课程总分 + # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分 + def static_project_score obj + score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + end + # 获取组织成员中文名字 def get_org_member_role_name member case member.roles[0].name diff --git a/app/models/message.rb b/app/models/message.rb index c43657aa5..a133ecdfc 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -127,9 +127,15 @@ class Message < ActiveRecord::Base # 发帖精辟更新发帖总数 def add_boards_count - if self.project && self.parent_id.nil? - count = self.project.boards_count + 1 - self.project.update_attribute(:boards_count, count) + if self.project + # 讨论区 + if self.parent_id.nil? + count = self.project.boards_count + 1 + self.project.update_attribute(:boards_count, count) + else # 回复 + count = self.project.boards_reply_count + 1 + self.project.update_attribute(:boards_reply_count, count) + end end end @@ -314,8 +320,14 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count if self.project && self.parent_id.nil? - count = self.project.boards_count - 1 - self.project.update_attribute(:boards_count, count) + # 讨论区 + if self.parent_id.nil? + count = self.project.boards_count - 1 + self.project.update_attribute(:boards_count, count) + else # 回复 + count = self.project.boards_reply_count - 1 + self.project.update_attribute(:boards_reply_count, count) + end end end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8bee1b7e2..8ecc6fb54 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -76,12 +76,13 @@
      <% if @project.project_type == 0 %> - <% unless project_scores(@project) == 0 %> + <% unless static_project_score(@project) == 0 %> <%= l(:label_project_score)%> : - <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id}, :class => "c_orange f14" ) %> + <%= link_to(format("%.2f" ,static_project_score(@project) ).to_i, + {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, + :id => @project.id}, :class => "c_orange f14" ) %> <% end %> <% end %>
      diff --git a/db/migrate/20160113063514_add_messages_count_to_project.rb b/db/migrate/20160113063514_add_messages_count_to_project.rb new file mode 100644 index 000000000..218ac3cc4 --- /dev/null +++ b/db/migrate/20160113063514_add_messages_count_to_project.rb @@ -0,0 +1,5 @@ +class AddMessagesCountToProject < ActiveRecord::Migration + def change + add_column :projects, :boards_reply_count, :integer, :default => false + end +end diff --git a/db/migrate/20160113064153_statics_boards_reply.rb b/db/migrate/20160113064153_statics_boards_reply.rb new file mode 100644 index 000000000..baf427b10 --- /dev/null +++ b/db/migrate/20160113064153_statics_boards_reply.rb @@ -0,0 +1,14 @@ +class StaticsBoardsReply < ActiveRecord::Migration + def up + Project.all.each do |project| + puts project.id + unless project.boards.first.nil? + messages_count = Message.where("board_id =? and parent_id is not ?", project.boards.first.id, nil).count + project.update_attribute(:boards_reply_count, messages_count) + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index fc3762bd1..5079e6655 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 => 20160108024752) do +ActiveRecord::Schema.define(:version => 20160113064153) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1417,6 +1417,7 @@ ActiveRecord::Schema.define(:version => 20160108024752) do t.integer "news_count", :default => 0 t.integer "acts_count", :default => 0 t.integer "journals_count", :default => 0 + t.integer "boards_reply_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css index 054b0bf99..b8b624154 100644 --- a/public/stylesheets/scm.css +++ b/public/stylesheets/scm.css @@ -52,6 +52,7 @@ table.filecontent th.line-num { -ms-user-select: none; -webkit-user-select: none; font-weight:normal; + white-space: nowrap; } table.filecontent th.line-num a { text-decoration: none; From 7697dadbead2455a740344537e255a1346b89014 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 15:50:55 +0800 Subject: [PATCH 23/84] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=AC=A1=E6=95=B0=E5=88=B7=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 0f3724d6f..4d407e35e 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -344,20 +344,15 @@ update #Modified by young # (show_error_not_found; return) unless @entries g = Gitlab.client - - # count = 0 - # (0..100).each do |page| - # if g.commits(@project.gpid,:page => page).count == 0 - # break - # else - # count = count + g.commits(@project.gpid,:page => page).count - # end - # end - @changesets = g.commits(@project.gpid, :ref_name => @rev) # @changesets = @repository.latest_changesets(@path, @rev) # @changesets_count = @repository.latest_changesets(@path, @rev).count @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count + # 访问该页面的是会后则刷新 + if @changesets_all_count != @project.commits_count && @changesets_all_count != 0 + update_commits_count(@project, @changesets_all_count) + end + # end @changesets_latest_coimmit = @changesets[0] @properties = @repository.properties(@path, @rev) @repositories = @project.repositories @@ -583,6 +578,10 @@ update end private + # 更新项目统计数 + def update_commits_count project, count + project.update_attribute(:commits_count, count) + end def find_repository @repository = Repository.find(params[:id]) From 24df6d30d696b1f833a162168db5a40d4a4144c3 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 Jan 2016 16:15:46 +0800 Subject: [PATCH 24/84] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../projects/_project_score_index.html.erb | 17 +++-- .../projects/_show_projects_score.html.erb | 63 ++++--------------- config/locales/projects/zh.yml | 2 + 4 files changed, 23 insertions(+), 61 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4b7820037..246dae511 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,7 +52,7 @@ module ApplicationHelper # 获取项目/课程总分 # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分 def static_project_score obj - score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + score = obj.issues_count * 4 + obj.journals_count + obj.commits_count * 4 + obj.boards_count * 2 + obj.boards_reply_count + obj.news_count + obj.attachments_count * 5 end # 获取组织成员中文名字 diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb index f10c6b3e7..beff3552e 100644 --- a/app/views/projects/_project_score_index.html.erb +++ b/app/views/projects/_project_score_index.html.erb @@ -1,10 +1,9 @@ - -
      <%= l(:label_projects_score) %>
      -
      = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + - <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %>
      -
      = <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> + - <%= format("%.2f" , documents_score(project)).to_i %> + <%= format("%.2f" , changesets_score(project)).to_i %> + - <%= format("%.2f" , board_message_score(project)).to_i %>
      -
      = <%= format("%.2f" , project_scores(project)).to_i %>
      - \ No newline at end of file +
      = <%= l(:label_code_submit_score) %> + <%= l(:label_issue_score) %> + <%= l(:label_file_attachment_score) %> + <%= l(:label_topic_score) %> + <%= l(:label_news_score) %>
      +
      = <%= @project.commits_count * 4 %> + + <%= @project.issues_count * 4 + @project.journals_count %> + + <%= @project.attachments_count * 5 %> + + <%= @project.boards_count * 2 + @project.boards_reply_count %> + + <%= @project.news_count %> +
      +
      = <%= static_project_score(@project) %>
      diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb index 68ba2f12a..b70a49f80 100644 --- a/app/views/projects/_show_projects_score.html.erb +++ b/app/views/projects/_show_projects_score.html.erb @@ -1,5 +1,3 @@ - -

      <%= l(:label_projects_score) %>

      @@ -21,65 +19,28 @@
      - -
      • - <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> : - <%= format("%.2f" , project_scores(@project) ).to_i %> + <%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> : <%= static_project_score(@project) %>
        • +
      • + <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> : <%= @project.commits_count * 4 %> +
      • - <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : - <%= format("%.2f" , issue_score(@project)).to_i %> + <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.issues_count * 4 + @project.journals_count %>
        • -
      • - <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> : - <%= format("%.2f" , news_score(@project)).to_i %> +
      • + <%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.attachments_count * 5 %>
        • +
      • + <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : <%= @project.boards_count * 2 + @project.boards_reply_count %> +
      • - <%= link_to l(:label_file_score), "javascript:void(0)", :onclick => "show_div('file_score_index')"%> : - <%= format("%.2f" , documents_score(@project)).to_i %> -
        • -
      • - <%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> : - <%= format("%.2f" , changesets_score(@project)).to_i %> -
        • -
      • - <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : - <%= format("%.2f" , board_message_score(@project)).to_i %> + <%= link_to l(:label_news_score), "javascript:void(0)", :onclick => "show_div('news_score_index')"%> : <%= @project.news_count %>
      <%= render :partial => 'projects/project_score_index', :locals => {:project => @project } %> -
      - \ No newline at end of file +
    • \ No newline at end of file diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 3f86b4b60..fe89e64e3 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -432,6 +432,8 @@ zh: label_file_score: 文档得分 label_file_number: 文档的数量 + + label_file_attachment_score: 资源得分 label_code_submit_score: 代码提交得分 label_code_submit_number: 代码提交频率 From 897eabd57a7e5cb6c1633ab3931bfe871e0706f8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 13 Jan 2016 16:21:37 +0800 Subject: [PATCH 25/84] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=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/controllers/org_subfields_controller.rb | 2 +- app/views/files/_subfield_files.html.erb | 2 +- .../files/_upload_subfield_file.html.erb | 16 +++--- app/views/layouts/_user_courses.html.erb | 51 +++++++++++++------ app/views/layouts/_user_projects.html.erb | 6 +-- app/views/layouts/new_base_user.html.erb | 2 +- config/routes.rb | 2 +- public/stylesheets/share.css | 1 + 8 files changed, 49 insertions(+), 33 deletions(-) diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 465bf1208..6bd6ecbf0 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -23,7 +23,7 @@ class OrgSubfieldsController < ApplicationController @organization = Organization.find(params[:id]) @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+ "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+ - " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:name]}'").first + " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first if @org_subfield.field_type == 'Post' redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id) end diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb index 1a222780e..6da0caccb 100644 --- a/app/views/files/_subfield_files.html.erb +++ b/app/views/files/_subfield_files.html.erb @@ -78,7 +78,7 @@ <% if topic %> diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js index 651f33464..72aeacb39 100644 --- a/public/assets/kindeditor/at/config.js +++ b/public/assets/kindeditor/at/config.js @@ -23,7 +23,7 @@ var enableAt = function(_editor) { } if('undefined' != (typeof id)){ - names = '/at/' + id + '?type='+type; + names = '/at/' + id + '.json?type='+type; } //var names = ["Jacob","Isabella","Ethan","Emma","Michael","Olivia","Alexander","Sophia","William","Ava","Joshua","Emily","Daniel","Madison","Jayden","Abigail","Noah","Chloe","你好","你你你", "가"]; From 893e5dc7f3f69eb924b18628ab6e944b7b491f98 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Jan 2016 18:33:22 +0800 Subject: [PATCH 32/84] =?UTF-8?q?=E9=92=88=E5=AF=B9=E8=AF=BE=E7=A8=8B370?= =?UTF-8?q?=E7=9A=84=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_project_info.html.erb | 191 ++++++++++++----------- public/images/course/boutique.png | Bin 0 -> 10183 bytes public/images/course/medal.png | Bin 0 -> 1579 bytes public/stylesheets/courses.css | 1 + 4 files changed, 100 insertions(+), 92 deletions(-) create mode 100644 public/images/course/boutique.png create mode 100644 public/images/course/medal.png diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index 51758ea4c..60fc6f96d 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -1,92 +1,99 @@ -<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% teacher_num = searchTeacherAndAssistant(@course).count %> -<% student_num = studentCount(@course) %> -<% course_file_num = visable_attachemnts_incourse(@course).count%> - -
    <%= @course.is_public == 0 ? "私有课程" : "公开课程" %>
    -
    -ID:<%= @course.id%> -
    - -
    - - - - - - - - - - - - - - - - - - - - -
    - -
    - - <%= @course.name %> - - <%# if @course.is_public == 0%> - - - <%# end %> - - <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> - - <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%> - - <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0%> - - <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%> - - <%else%> - <%end %> - -
    -
    -
    -
    -<%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>） -|  -<%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>） -|  -<%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）
    -
    -<% if is_teacher %> -
    -
      -
    • -
        -
      • <%= link_to "课程配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %>
        • -
      • <%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %>
        • -
      • <%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "postOptionLink" %>
        • -
      -
      • -
    -
    -<% end %> +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +<% teacher_num = searchTeacherAndAssistant(@course).count %> +<% student_num = studentCount(@course) %> +<% course_file_num = visable_attachemnts_incourse(@course).count%> + +
    <%= @course.is_public == 0 ? "私有课程" : "公开课程" %> + <% if @course.id == 370 %> + 精品课程 + <% end %> +
    +
    +ID:<%= @course.id%> +
    + +
    + + + + + + + + + + + + + + + + + + + + +
    + +
    + + <%= @course.name %> + + <%# if @course.is_public == 0%> + + + <%# end %> + + <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> + + <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%> + + <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0%> + + <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%> + + <%else%> + <%end %> + +
    +
    +
    +
    +<%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>） +|  +<%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>） +|  +<%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）
    +
    +<% if is_teacher %> +
    +
      +
    • +
        +
      • <%= link_to "课程配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %>
        • +
      • <%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %>
        • +
      • <%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "postOptionLink" %>
        • +
      +
      • +
    +
    +<% end %> diff --git a/public/images/course/boutique.png b/public/images/course/boutique.png new file mode 100644 index 0000000000000000000000000000000000000000..4a73020e1c2338bce7fe80ec95969c28d5aabc92 GIT binary patch literal 10183 zcmaiaWmFv9wk__`c<`pt1a~J$b&}&`59%)@UF&Bsc^J65N7AAb9ZLPH^Yt zJNKM>?~ga$t5H>Z?={w(%Vzzn7)^CWd>kqqBqSt!WhJoo-_`r?qk)C-_dT-}>+^S^ z^pZF9(s8r(^0D%OBFWgeL7+fo7b`ocHq^=n?mh&SKte(VIOrOB8LGVzvvzagviiq| z%hv_=7mb7@@!A(=W$gs@0z#m64z7}*lh#fU(7{F$WFV- zoUBD{K(D2M624-830$CFRzP1DXID=#UrErvc*Xwi|1ooefd6vwa*_o7S5k&*nm{=> z4=7NOi=We)hnE*9B*eulASfin%K_x$;pOAz`Fjg-@(PFv3W@Ov1OI)2{zmh#u@%z> zEBrgw-;*TB-pdOn#?9^HiI9e;B|} zPiqecn3sc_EASsiD~Ox7mn7(KrvFuf3rtPzzlmKv|J|s+E#vmJf^qY5@o>Ai{8QJz zygj|Nq5qS{|JB=57Y>7RYePNVygjV{&cl}RKj6Q;`+o=e$MJ7AVqiCGZx^Vmmoiuq z^w+{=<6t8uEH5Ae77`SY6$Q)j^2!T}$Oy@Z3W7ysMdXBp6!`i7gH?9*^s;ibhW-cZ z@IP4o|0h;V&I4-Y<>sO5=H~pL>1o=#dAWJoyTO2RIzm7L2Ui<6AJ2ap`|muV9u9Az zHVPhYF2H|vM$F-VMHdnk68)Q~kcfhSkdVBftRTNAuYw2~fx5D>34jq7g3J9`Q;?!GV9~D9?XhPl6kw z5SNn@pvNG(!-<+|_C0n^(L;-@DE)89&>hEBM{EO{uBsF{(IeI`hr~Gr>f5s;gO}0L z@T@cRZ1arqS5^l)fxR*j807XMMp5NBumccHChc26dSNN{YQ;R4o3hvK&YnAj1KOQN z?T+u}?;7O5^+*YQm*eax)5CI@CNzfMJSM-_bTkk3!@E_fm_P*8NR-i1dJ*VAXQFY}lpHp6 z%3G`kfUXc*vn=BeQg6SMR6ZNOU=Y^kCloIWtdLVS(Wm2k@}|z~ap!9DjY12*rx8f% zUO96X35s9-w8vo$eZ1J8-y`+eJ6zyMTtP6~pmd77A?3?WN9k13bj5F3i%h5@$*2u{ zzX8FvMxY^3!4f%0mlS;GjrET1mYA?z@$UMFjw&y0daFPF`MCI-b0n*sK@_d3!PvFi z%Is?u+%E9SOA<=HJsW_BqR^Be9{?30&xJ;;$F&S zY%|9-mP>ms;odlbHiK;O{MT6Lc7tP+PwvXp)f#`r&b^RpYd6`2rYjMEuL7_M$mWaj z@KDZULkP!$UE!oE$kF6PwcsRW)Z-Z43ax+fzTpI9{kWrGCXIjUV zZ{;0_u9q4rFQbWYN7t3fIgg5J`|UT#+Gp z`ty0m#n47Qam(Xsd;M(K{)lL9o70e|YQRS!!Z>Y700%M(zmj%DRIe(BTix){-QW$|T&GUJ4r`Bc*%hNHWk%4su{D-6W%O3<$q3NvwIs94&a} zzC^vU7?VU%z3{@0&O&CZ*;7a@OIPj};js4_Sj*T?%oSK5zdhL*H^$wUmq!$WwVwW5 zOGzZso;oo^$bLh+ayzvdKBpRZrT?(X ziYFh4k|4uNh&6+I zXu0Dk9kzh^{zdRBK2(^(hb>)_&^Dy)A{HEjZs3-x0Y~yNWh_h4fGiBW_K;r1HYq!} ztI9BM79*)s($ndHN@JV(l+J67Yvzcw86yyrYMnW_v)kD3@EW6kmDrLS&TcoDsyY`p zcdFx>fsS5lo|SK&FR{ctuq=A>ZJSYXykXW!^G_bZWe`U_zFDgJyNf@ijO=rxDk5nV zj31OE-{b75XBx7bv2HBNvJ~E;lg zw}5{#9bZQ;$;~L==RpS9ulvpF0+l!1m>tle&lC~7YC%2-s(E-EfbV>>j&HQ#Hls7X zUQmm9Lh=$nr_z^9!tdqDV%x8LV_UFLU8v0!BK(akIZ86F|9Y9QK1ObGyar}7q=Q8_ zkIMettV1^PvfpIF)>M) zhw8^4?K~8A>MR5E_6lLU5+O{)4NY~pDeO!lVTF`>eGsyGY&E}Yh0zcGM3bAZeA!iD zeE0aK0S9VI-JXC$0ix(tV-)gDG}_%SznKM^KfP}M5Q}1y_bA@}Jg$~~_W^Zm=)E<+$qUM# z8{>*?j&cq_6uVJ#SbSE&PWX_BDqZgNAL{5Sqw%67hYz8>HD>)*-*g}XF+E)8^GU$M z53+3oM8{5^8)`Kr`1FDrj+#34@f&YCR;T)(^)%04`)zbz7WH#SkBX8}4D2_67zv5t zC6wv;(r@x=b#S2J&cW@Xb+zC*$t|enh^nUYbwn$w$U~1f54|WsMP}6M8&O2t*m8HI*s2W)R1r|r50VpjV?T)sHAsAgiP(DaPRuEMUU}^D5ZI6 zSM-RjQwuDoI}I$LzQh;J6^iI}4APuXNiz+nz~<}bs1o5_|6YaBKpZm1Xdmp)tL^%? z7TBEy{I~An2Ay@9f!AZ0HYhqxk!(TmZv6o!loXvx8@yzSEPAqwOhIfkz60I0_=(+5 z3-qxGa)~o1-3xUuahhCv=5$K(5v?=@!So#;{FK_y-}c2*N`sa06`Pjx)*sjwK|UeCQvfW&IjU8!gDl%##qks>A<(_ z3rs&S8lPsfVF%eEvB#pQaiNo47)nVV`TqJa>8X9U`gBY$FCEm>V#K!Ndp4H*^1g34 z%~Rg3R>!lvAH-uqYz=k(NL)-q8k*N^uPHDo$#VLxC6BeIP}7iQfZ?(yot%h#)2if+ zd+`I_;pBR>>PT?CGCyq0xajdF1}0FJSlDjyd$4$j?Pk;39^4#mzC2;mZ*9--%;v05 zG_c}FSz@aeak`A`tG*SYQJuIeKV8_GwOX08r6C4J)`gi&5Wib z_c5u>bL$*;j5UEdDy2ZyHo}8m%MTLyhYls)*3Sw}nN$_astz0BN{v#EeayloqCwXC zsVs6`f_xdv+u2**&O`3Hmn0|rslp;+USi7EY_E`7(cCD8k-jao^n9mVRpPOVme!6- zwue>@I}O+o5I|o3bVmh=dA|=4k&O)~Uo{N!68GQ{@}-Siu=m{iT+%R-XkNBrbMDba{guHglA6{s4y) zx24%RK7AS8{;0CjRnFf=v|nh01OLtx$TrPkZ-B>m_c1xaidyCeh zYfY*TZP86FeW}HhvlpeT6Xz-wk7obvCElN~sJ5h9%cqIbIJ#CxRqtcr5aWWfp2BbE zc(1hXo(AOJLe-wW`pwN{))u0?2TtM5#WC|{*7Kn&=f27pD0)d1Pl;R|7u}E0K2?j3 zkrE`sKcT~8XDx7i=50>Qi&Q#xW=V9{%!RIJY-2p2#YQwc>S>8yoJkz|uPgf!9!30s z$n;z`6BolK3u}z>rzh5AZNIWY(WmxK=oUr(7d)c-nc zW?j}Zj#7bK#VMQ}_y(~A1fj16j z1!FYDhi4q>lWoYBFi#OpwNReT5*6jt(Hx^HVw={zta;&WJR4tq)~1C@kfqkIq4k-j z(T$?*m@k})xp1iX&)|nAw!Ts^7bF z_)jr{G<*CdT{eVahbil&a{w)M6q;~p*Qzdd zKPc(a7Od@DOtKJ(Ch*5p}rWlO7V?`Jd&EYPfJop71 zpnITa*ZEZ2Y9Eth`UFbFBnmdp)!KUgD%XotKtR1TSvVPXUSsWrCA zb%>C^oFW<7bRqanV+*2`Lc^Zuxp`4+?#cg~&tJL$uyL7gy&RSZf?eQM=kj7ZOworh zCk#Y{`D=P{P)uH?tm!{6F^*zgXIlPl?~_skEH*0kr&8MAuK60$yrr=?N9kbAZ`ODn z=9&(eYbS(cl@wkaEKg``=g;pbKsw(=tB!%E4(@u1sG}Hz0_pwh>7tyj)x&Yd*KQhX zG+UsU?U5KEWH7>#Ap8dvHQam6LpRtmXFU? zZjU_d6>wtynM%@JFv?_DzHy?`n5bd&rLn{%0~;}yf}iEy0`+B-nt%=Xaz&C!leGDl zU~idPD}Xi)#UN_7`HK}J0hAkTWR6UH5`dIRh}Zvg2*>K^#IMapP1BYNpHCPJxOGt~ zi(z{y6(LE&+Wn?rzF-gIl$AJmyuuvZK1!|CcFceH&Y7mY)8lKN2<|0)R-XA3uRyHWAr)pdDFowMEiM^}boh!^l2*4$Nl{nzCq(r{^#-holjc2O zxS9yUE79K#$B;p=VwPK^&tDD(o#1{@iH%QlPwVOYex&%$ithKlIlh6PiEgetiC#bWK1 z|4t{qV_CIHZmzh2Xs3Ix8s_I8&%m!PW{JLPk?~$ki}3HW@?J80v+3|VO7|&Fd&ze+ zuZDsh&FPxS$C3m#&F#1CQ**^4!}2!BK3M5p-4n^peK-Va|#O-^cF2%F%@fZBha7tR@FL#kc04+ zE^4Pd7D1$sW8t=*xzfG^xu>~Ok+DY~5x$GSuUU;)cSeK+96wM-)xACnQ*$a3M(s*P z9i7{DyAm*jcsN6LI_%#)1M`i$OEfrp8k<(76FX?N*1hF8y?bAN1SGxrvL_X;XRv-) z<{5o7m58OuUJCtw8q|s@rKLa=aYkU>&vsxa z!JtK!bGl>3eg^_meM^uw@9k?=%Hmq9kaabBne4X`UTW(SSGPQbD{Ak)ED1oz^^o$z zKl->FgTd(5Q}Dy0FWn(Uv&DxVG?W5aybc!~j#z54=*HB^=&Cm1wd~eqS`hVnkYEAFoJROgxoRHpl zBI;$puklB$?c<1BU0&kQRCP9=bX5jMABs6&=;wiY}-!Ec|-dyVp6pu3F$Hk_fdQzE|DyRQ=DF3VB?pX~e0 zrl_~W!G}iIXZEr~(b4aJp79elZqmc5Q*k$~Qn^gB9(i9peUs_x;JQKPbVS%yNm8fC&5;BV z%snwA+#PW_PWnkrLekswl+iA;L^F9$_|$nhmMNfoJPn$Zjuw;h6)3$;67?OX-Dzb-#w^j(^pR(g)^O3+ zT+BNw&jSfHYJzqqGGOTVy*g>O^%7l&fY|dI-Mt3PERf9 zi{mtePDb^HF=}#aOU0g~#t`6c1FP*`>mEu)Ti;*jPsYyyJG=>Lg0|GM{choq9wvHY zVTDJ!unC*9BCIs>jrR^I?zU437nJ^$ED34v`^S z#Dza_T7Ys*M_Hz9>L>1jZn)VsvXr&+#kpqrx)GWW^d`x}5ZXq7lJPTEY+NB_vT`JXthTq6=X6<1mT6Q(G)r z>&54h{{T>{8~kVzyx+^Z4#YQg!I3SnCz81p=6=Te{i{LRP$gMQm`f5)rO$|exUk}j=*PYb1ZziHZy$YSE>J< zH!1E_W|sL#dYg5LtEUCq?~>8Q3{`ql7S&Tlzc#w_5s`|BxuMIMIE|!UcTA5N?hHgd zv2!bcZBU<<)18gWe`#PWjmNx-#m`XfU%hO0~FG0jx*v+ z9X>`CHSEa@`#LJU{SXoDuuA1jF;b#Yh0+PZf3u#(bE}%K{Q}?IpI@xX7|#=qJv`?c z?s)?fF{M#&|4K8UUx~r`VbbveO`y$Rz^k6JZy@Qs-$|s_5_xOX5$zLFts%B{FxNYM zM*W!5KL9x#np8T0nQ&0-WJhES{76CSCZj(rsy+C1H{kevV%B(34@55ptFG+FqeKP7 z42hw@wn@kde@$R^wKsN!4^%E$8jUCSNK`c8G7b_s5DYfnLbW5)GS3Vv#~qlwULey< z=Ib)k)$;SAPlZtqNn!vioiqk96Mrv8(GO($NJX|=aC;fn(OlkJBrYYc_N@q;D?GlP z16F%`lF~}zU3y75%c_M5qY)9CP^CP4A+dhT#^MVlLbqk_acz6&a($bam~i6$Xm^u> zXQdR-=k;9|YPF-VxAep9(i*p)PnoK*vY(*e@-|(#v4O8ia znI{z?@F{#g-Jvui8InC@sp1e)+%d;+HJdBITkd{1*LjTnm zM0}(m5x(7oAH~j#4R@>R;Y}7xPua<5{gi*QIRN;$f^?cuX!&fualzME)m_{*c;-wY zboV3R!3%0+FqUiUhE&yAhU-1r_0%XKd7v>lk*Di+1Jx}h zB?Ne7i6bC8qD*;}vO@@n$Qz+#5*k@~iu~qw5uYaksz!%6b>Zu-@x61+#$%UV714ch z8`6_oQpFVw#XGYU%VaJ{uQlV^>J4R<-u{;?hb;Nlzi>w z6pNpd*X@=|iO{^pm>1IQdqqGK@D_i*zm9;Uzboq}T4A0vuMyB>G!pEE!O&G0f!x1A97otZx852x!DJgh=;6+|fo(ZrJ5 z5|6*aM8Lm)&$VjZte1R|pO!n<@|iesW(r~|Qng68fiYPb3dYo+4Zl?USltc}?9{8c z`@A9?phuhfO#1G*UW3&_3=ZZYDA#_0aQ_v*Y=5PM3AqKTL%9{h8kY^7n8%M7GZ1U_X(pH2JvJxpP`g7keS>;7|uWo9y{_*{u(7BFVUJkovJ`$Ymx)lz=$Gs zCJ{v+%81pl#zvr?jq_}0q6DjDG=tBhQY{HsaRE`%om`jZuRl@v3%9xTd3pywg{!x} zW^ru6%9H0!(7ca-;n{EdlvPh6vJDp-ULs=~9E;ezl3Q^HwCO1rjVt4Hs}Zg8l8orLd|AG7E8)haKBl&i^WO z_=FB!e|JW6?j|M?>k>gY+1VGXbRDZO@;(&lM?q>18>eW}Ca#QC>xwL2n_5=U$w-Y% z@dJDl!3%pn3j8ppuWL-k==O`0{go~@g=hu&Y{fz3sN%q=yWmN4Cqdowt5TkpU(kfh zCma}C>VsEafy-DH`W87zjfI{neV|J<>ng4u&&8DrZH6L5$HG-!*Bcvc9H;(Rri(OK zyts>gaemo;DZKKnPrPq6LHTQ(X?kd4frOMu!Thf9Xx^#lnXFN93 z4qwo|6(K{-gYzHcYeLB=lyQe1T}@Yg{z|oH(R;-JQ;qX%I*(afc5H9T`8@=z8O0AQ z2oDgck;yKZkt5`I)4KH}Us$jH*;FBSSX~C2NN(0qAC3ZQW8iPjZ5JxBQ_H4VxGV4V zhE3P~?&X#nmQJ(6)>^sv!xpUpQylddIM{ERyQ)FG;KT29=3PW(Z)-zStT|r1dy~z> zS?JOvW@~aU^Y~|QCg`)G;Pprck}N_wcbe#$!$HVvcPd$OMaS;xwM2Kb@Xvsaqxs|vIU!1@ zSS#6*C(l6CJHRf(7j}zCWY*oL46t_C5IL4P|0}_}g>M^;ab+o=!|i7G#*O#N1ntiL zD4bKq=~Oyhc~jA5_3uqdptMoCUX7U`+>bG?3Cyzj0(LjADm6E#r3EtLr zzv^nRtyoR#X}4s~jDwP7U4IaW8%u~;8Ef~?i0_a3Q+~0KPjY(DGl&Zq*4KbehU2_F zmiH|#*~`aF7o-oI1FevqyqwfC;b6Vle`7i#smD*1sk@=%o)EZ5#99cj75U{eKWly1 zOgWk3KMUW1Zj~Lvpz%l3Ribt))X7BAScJAqfzMM8y;0n2j0gIe#=*qS zut?qcA!|W%2ErL45TQ_t4~{vlUQWx=;D?)urJLh9=W2d4&THLS?;nU+uR6El9laao zxBIaQP0Xg#@YHZcG!wi|Yv|73ujj0~SxmuyVN-WFhuo-a!E?CQ^Jw9%A2OtMRFab} zM})aUv8Lu=)cf0(Zo-QywJ^~^nd`GtamK)y>($I<$IY;yb;$E|mdiJ~5XZX*rBSw{nF^oySYGpyTXy5I-DSr z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC41bai!dbG5KA zH*hp_gXwk2PcF?(%`1WFO+n~2!l@UO6mkoIHoK%2WtOF;xE1B+DuBIgm5I|WMs7IG zgX&Ge?G^)^di8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-x}!*Z7~Ffh&cba4!+ zxD_%n+CwBz;`sUUXWQPr^T}E*eS6WewHlKaUUFUGz{Ry=z32WS5*s3_1~R2_vXx;%aP$5{^{S}`G@cMO@> zjM`@(ndQ*uXqLEf?bMdAvXUGX3(2@yKWy!{NzARhx!QD&^0LgAY_Z()InPBoFMijp z?hzdO$je>eY@H{*!FR!kKS=(sZsz0wThnHFLUO#tw^5v(ySN~yu z?Va`K+b5+td4BDOLIfPkHvc!Qex6}zS^qk)=C;`81sitR6}))2)L|pLx%pC?bsw%; zd)?M#NYL1z_GXIJme&;*Z&z1rI3Kyjy4(2LkMQKzeJu3{cHG_k`LVDH*J};!;`edd zx96@C>bLyfsPpH^MU%!*(?yO?4ZI Date: Wed, 13 Jan 2016 18:42:25 +0800 Subject: [PATCH 33/84] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 2f6c4ecc7..63f152eb2 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -683,7 +683,7 @@ class StudentWorkController < ApplicationController if !params[:name].nil? condition = "%#{params[:name].strip}%".gsub(" ","") end - @project_ids = Project.where("user_id = #{User.current.id} and name like '#{condition}'") + @project_ids = Project.visible.where("user_id = #{User.current.id} and name like '#{condition}'") @first = params[:first].to_i respond_to do |format| format.js From f7a88a63e0d737ec21773373ddcdd7516a510ae8 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 13 Jan 2016 18:46:28 +0800 Subject: [PATCH 34/84] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=8A=A8=E6=80=81=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...13090435_update_forge_and_user_activity.rb | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 db/migrate/20160113090435_update_forge_and_user_activity.rb diff --git a/db/migrate/20160113090435_update_forge_and_user_activity.rb b/db/migrate/20160113090435_update_forge_and_user_activity.rb new file mode 100644 index 000000000..d8fbbbfb6 --- /dev/null +++ b/db/migrate/20160113090435_update_forge_and_user_activity.rb @@ -0,0 +1,42 @@ +class UpdateForgeAndUserActivity < ActiveRecord::Migration + def up + user_count = UserActivity.all.count / 30 + 2 + transaction do + for i in 1 ... user_count do i + UserActivity.page(i).per(30).each do |user_act| + if user_act.act_type = 'Issue' + if user_act.act + if user_act.act.journals.count > 0 + user_act.updated_at = user_act.act.journals.maximum("created_on") + user_act.save + end + else + user_act.destroy + end + end + end + end + end + + for_count = ForgeActivity.all.count / 30 + 2 + transaction do + for i in 1 ... for_count do i + ForgeActivity.page(i).per(30).each do |for_act| + if for_act.forge_act_type = 'Issue' + if for_act.forge_act + if for_act.forge_act.journals.count > 0 + for_act.updated_at = for_act.forge_act.journals.maximum("created_on") + for_act.save + end + else + for_act.destroy + end + end + end + end + end + end + + def down + end +end From 90acb7816f506f939dc2a51266b4c71ca9d9d123 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 14 Jan 2016 09:38:00 +0800 Subject: [PATCH 35/84] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160113090435_update_forge_and_user_activity.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20160113090435_update_forge_and_user_activity.rb b/db/migrate/20160113090435_update_forge_and_user_activity.rb index d8fbbbfb6..01cedded0 100644 --- a/db/migrate/20160113090435_update_forge_and_user_activity.rb +++ b/db/migrate/20160113090435_update_forge_and_user_activity.rb @@ -4,7 +4,7 @@ class UpdateForgeAndUserActivity < ActiveRecord::Migration transaction do for i in 1 ... user_count do i UserActivity.page(i).per(30).each do |user_act| - if user_act.act_type = 'Issue' + if user_act.act_type == 'Issue' if user_act.act if user_act.act.journals.count > 0 user_act.updated_at = user_act.act.journals.maximum("created_on") @@ -22,7 +22,7 @@ class UpdateForgeAndUserActivity < ActiveRecord::Migration transaction do for i in 1 ... for_count do i ForgeActivity.page(i).per(30).each do |for_act| - if for_act.forge_act_type = 'Issue' + if for_act.forge_act_type == 'Issue' if for_act.forge_act if for_act.forge_act.journals.count > 0 for_act.updated_at = for_act.forge_act.journals.maximum("created_on") From 324513fc94c5ce0cc9c5ae122e7ef132ff8eecc7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 14 Jan 2016 10:33:15 +0800 Subject: [PATCH 36/84] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E5=AD=90=E7=9B=AE=E5=BD=95=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org_document_comments_controller.rb | 7 +- app/controllers/org_subfields_controller.rb | 95 ++++++++++--------- app/views/files/_subfield_files.html.erb | 2 +- .../files/search_files_in_subfield.js.erb | 1 + .../org_subfields/_show_details.html.erb | 80 ++++++++++++++++ .../org_subfields/_show_post_type.html.erb | 35 +++++++ app/views/org_subfields/show.html.erb | 11 ++- app/views/org_subfields/show.js.erb | 5 + .../_org_left_subfield_list.html.erb | 8 +- 9 files changed, 190 insertions(+), 54 deletions(-) create mode 100644 app/views/org_subfields/_show_details.html.erb create mode 100644 app/views/org_subfields/_show_post_type.html.erb create mode 100644 app/views/org_subfields/show.js.erb diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 7685b77a8..f250b46de 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -20,7 +20,12 @@ class OrgDocumentCommentsController < ApplicationController flash.keep[:notice] = l(:notice_successful_create) EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at) if params[:field_id] - redirect_to organization_path(@organization, :org_subfield_id => params[:field_id]) + @org_subfield = OrgSubfield.find(params[:field_id]) + if @org_subfield.subfield_subdomain_dir.nil? + redirect_to organization_path(@organization, :org_subfield_id => params[:field_id]) + else + redirect_to show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => @org_subfield.subfield_subdomain_dir.name) + end else redirect_to organization_org_document_comments_path(@organization) end diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 6bd6ecbf0..9b8cbcf93 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -1,4 +1,5 @@ class OrgSubfieldsController < ApplicationController + helper :attachments layout 'base_org' def create if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0 @@ -25,54 +26,56 @@ class OrgSubfieldsController < ApplicationController "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+ " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first if @org_subfield.field_type == 'Post' - redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id) - end - if params[:sort] - params[:sort].split(",").each do |sort_type| - order_by = sort_type.split(":") - - case order_by[0] - when "filename" - attribute = "filename" - when "size" - attribute = "filesize" - when "attach_type" - attribute = "attachtype" - when "content_type" - attribute = "created_on" - when "field_file_dense" - attribute = "is_public" - when "downloads" - attribute = "downloads" - when "created_on" - attribute = "created_on" - when "quotes" - attribute = "quotes" - else - attribute = "created_on" - end - @sort = order_by[0] - @order = order_by[1] - if order_by.count == 1 && attribute - sort += "#{Attachment.table_name}.#{attribute} asc " - if sort_type != params[:sort].split(",").last - sort += "," - end - elsif order_by.count == 2 && order_by[1] - sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " - if sort_type != params[:sort].split(",").last - sort += "," - end - end - end + @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0 + @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10) + #redirect_to organization_path(@organization, :org_subfield_id => @org_subfield.id) else - sort = "#{Attachment.table_name}.created_on desc" + if params[:sort] + params[:sort].split(",").each do |sort_type| + order_by = sort_type.split(":") + case order_by[0] + when "filename" + attribute = "filename" + when "size" + attribute = "filesize" + when "attach_type" + attribute = "attachtype" + when "content_type" + attribute = "created_on" + when "field_file_dense" + attribute = "is_public" + when "downloads" + attribute = "downloads" + when "created_on" + attribute = "created_on" + when "quotes" + attribute = "quotes" + else + attribute = "created_on" + end + @sort = order_by[0] + @order = order_by[1] + if order_by.count == 1 && attribute + sort += "#{Attachment.table_name}.#{attribute} asc " + if sort_type != params[:sort].split(",").last + sort += "," + end + elsif order_by.count == 2 && order_by[1] + sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " + if sort_type != params[:sort].split(",").last + sort += "," + end + end + end + else + sort = "#{Attachment.table_name}.created_on desc" + end + @container_type = 2 + @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)] + @organization = Organization.find(@containers.first.organization_id) + show_attachments @containers + @tag_list = attachment_tag_list @all_attachments end - @container_type = 2 - @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)] - @organization = Organization.find(@containers.first.organization_id) - show_attachments @containers - @tag_list = attachment_tag_list @all_attachments @page = params[:page] || 1 #render :layout => 'base_org' end diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb index 6da0caccb..7332f4892 100644 --- a/app/views/files/_subfield_files.html.erb +++ b/app/views/files/_subfield_files.html.erb @@ -53,7 +53,7 @@ <%#= render :partial => "files/subfield_tags", :locals => {:tag_list => @tag_list,:org_subfield => @org_subfield,:tag_name => @tag_name}%>
    -

    共有 <%= @all_attachments.count %> 个资源

    +

    共有 <%= @all_attachments.count %> 个资源

    <% if @order == "asc" %> 按 <%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> /  diff --git a/app/views/files/search_files_in_subfield.js.erb b/app/views/files/search_files_in_subfield.js.erb index dfaa56a6c..77c364817 100644 --- a/app/views/files/search_files_in_subfield.js.erb +++ b/app/views/files/search_files_in_subfield.js.erb @@ -4,4 +4,5 @@ <% else %> $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list', :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>"); + $("#attachment_count").html("<%= @result.count %>"); <% end %> \ No newline at end of file diff --git a/app/views/org_subfields/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb new file mode 100644 index 000000000..7d83efaa1 --- /dev/null +++ b/app/views/org_subfields/_show_details.html.erb @@ -0,0 +1,80 @@ + +<% unless org_activities.nil? %> + <% org_activities.each do |act| %> + + <% if act.container_type == 'Organization' %> + <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> + <%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %> + <% end %> + <% end %> + <% if act.container_type == 'Project' %> + <% case act.org_act_type.to_s %> + <% when 'Message' %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %> + <% end %> + <% end %> + <% if act.container_type == 'Course' %> + <% case act.org_act_type.to_s %> + <% when 'Message'%> + <%= render :partial => 'organizations/org_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %> + <% end %> + <% end %> + <% if act.container_type == 'OrgSubfield' %> + <% if act.org_act_type == 'Message' and act.org_act_id and Message.where("id=#{act.org_act_id}").count > 0 %> + <% message = Message.find(act.org_act_id) %> + <% if !message.board.course_id.nil? %> + <%= render :partial => 'organizations/org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %> + <% elsif message.board.project_id != -1 %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %> + <% elsif message.board.org_subfield_id %> + <%= render :partial => 'organizations/org_subfield_message', :locals => {:activity => message, :user_activity_id => act.id} %> + <% end %> + <% end %> + <% end %> + <% end %> + +<% end %> + +<% if org_act_count == 10 %> + <%= link_to "点击展开更多",show_org_subfield_organization_path(:id => @organization.id,:page => @page.to_i + 1,:sub_dir_name => params[:sub_dir_name]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% end%> + diff --git a/app/views/org_subfields/_show_post_type.html.erb b/app/views/org_subfields/_show_post_type.html.erb new file mode 100644 index 000000000..defbbce1e --- /dev/null +++ b/app/views/org_subfields/_show_post_type.html.erb @@ -0,0 +1,35 @@ +<%= javascript_include_tag "jquery.infinitescroll.js" %> + +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> + + + +

    +
    <%= @org_subfield.name %>
    +
    + +<% if @org_activities %> + <%= render :partial => 'org_subfields/show_details', + :locals => {:org_activities => @org_activities, + :page=> @page, + :org => @organization, + :org_act_count=> @org_activities.count} %> +<% end %> + + + + + diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb index 40ad1cafb..cf214e038 100644 --- a/app/views/org_subfields/show.html.erb +++ b/app/views/org_subfields/show.html.erb @@ -1,7 +1,10 @@ - -
    - <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %> -
    +<% if @org_subfield.field_type == 'Resource' %> +
    + <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %> +
    +<% else %> + <%= render :partial => 'org_subfields/show_post_type'%> +<% end %> +
    • @@ -31,7 +61,7 @@ <%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.project_score.issue_num * 4 + @project.project_score.issue_journal_num %>
    • - <%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> : <%= @project.project_score.attach_num * 5 %> + <%= link_to l(:label_file_attachment_score), "javascript:void(0)", :onclick => "show_div('file_score_index')"%> : <%= @project.project_score.attach_num * 5 %>
    • <%= link_to l(:label_topic_score), "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> : <%= @project.project_score.board_num * 2 + @project.project_score.board_message_num %> diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index fe89e64e3..ffa2c1cc5 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -433,6 +433,7 @@ zh: label_file_score: 文档得分 label_file_number: 文档的数量 + lable_file_attachment_number: 资源数 label_file_attachment_score: 资源得分 label_code_submit_score: 代码提交得分 From 6b7ce68e4a0c4622e8d62d5c73c1f7a77382c821 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 14 Jan 2016 17:52:48 +0800 Subject: [PATCH 54/84] =?UTF-8?q?=E5=90=84=E7=A7=8Dbug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_subfields_controller.rb | 1 + app/controllers/organizations_controller.rb | 1 + .../attachments/update_file_dense.js.erb | 4 +- app/views/courses/private_or_public.js.erb | 2 + app/views/layouts/_user_courses.html.erb | 2 +- app/views/org_subfields/show.html.erb | 60 +++++++++++++++++++ .../organizations/_subfield_list.html.erb | 4 +- app/views/projects/_attachment_acts.html.erb | 1 + app/views/projects/_project_create.html.erb | 1 + app/views/projects/_project_news.html.erb | 1 + app/views/users/_course_attachment.html.erb | 1 + .../users/_course_journalsformessage.html.erb | 1 + .../users/_resource_share_for_orgs.html.erb | 2 +- app/views/users/_show_detail_info.html.erb | 2 +- config/routes.rb | 16 ++--- db/schema.rb | 9 ++- public/stylesheets/org.css | 11 ++-- 17 files changed, 98 insertions(+), 21 deletions(-) diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 5850629f0..9f1d964ef 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -1,5 +1,6 @@ class OrgSubfieldsController < ApplicationController helper :attachments + include FilesHelper layout 'base_org' def create if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0 diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 25ee3dc48..b431678af 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -311,6 +311,7 @@ class OrganizationsController < ApplicationController def agree_apply_subdomain @organization = Organization.find(params[:organization_id]) + OrgMessage.find(params[:act_id]).update_attribute(:viewed, 1) @organization.update_attribute(:domain, params[:org_domain]) if OrgMessage.where("message_type='AgreeApplySubdomain' and organization_id=#{@organization.id} and content=?",params[:org_domain]).count == 0 OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain]) diff --git a/app/views/attachments/update_file_dense.js.erb b/app/views/attachments/update_file_dense.js.erb index 0a3124e83..7709ee288 100644 --- a/app/views/attachments/update_file_dense.js.erb +++ b/app/views/attachments/update_file_dense.js.erb @@ -6,8 +6,8 @@ $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@atta :remote => true, :class => "postOptionLink", :method => :post) %>"); <% else %> -$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), - :remote=>true,:class=>"f_l re_open",:method => :post) %>"); +$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), + :remote=>true,:class=>"postOptionLink",:method => :post) %>"); <% end %> <% if @attachment.is_public? %> $("#image_private_<%= @attachment.id%>").html('') diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb index 2f222fdfb..10b787dd4 100644 --- a/app/views/courses/private_or_public.js.erb +++ b/app/views/courses/private_or_public.js.erb @@ -10,7 +10,9 @@ <% else %> <% if @course.is_public? %> $("#set_course_public_<%= @course.id %>").text("设为私有"); + $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）"); <% else %> $("#set_course_public_<%= @course.id %>").text("设为公开"); + $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）"); <% end %> <% end %> \ No newline at end of file diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index cc07950e3..1d69306de 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -2,7 +2,7 @@
    • <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %> <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", - :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%> + :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%> <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
      • diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb index cf214e038..c7b52a7b8 100644 --- a/app/views/org_subfields/show.html.erb +++ b/app/views/org_subfields/show.html.erb @@ -6,6 +6,7 @@ <%= render :partial => 'org_subfields/show_post_type'%> <% end %> + - -
        - <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> - <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

        <%=(User.find project.user_id).show_name %>(组长)

        - -

        <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

        -
        - 项目名称：<%=project.name %>
        - 创建者：<%=(User.find project.user_id).show_name %>(组长)
        - 更新时间：<%=time_from_now time %> -
        + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> + <% projects = activity.student_work_projects.where("is_leader = 1") %> + <% unless projects.empty? %> + <% sort_projects = project_sort_update projects %> +
        +
        + # <%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_path(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
        - <% end %> -
        +
        + <% sort_projects.each_with_index do |pro, i| %> + <% project = Project.find pro.project_id %> + + +
        + <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

        <%=(User.find project.user_id).show_name %>(组长)

        +

        <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

        +
        + 项目名称：<%=project.name %>
        + 创建者：<%=(User.find project.user_id).show_name %>(组长)
        + 更新时间：<%=time_from_now time %> +
        +
        + <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> + <% end %> +
        + <% end %> <% end %>
        <% if is_teacher%> @@ -313,5 +340,14 @@
    diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 371334be1..df89f31eb 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -80,8 +80,8 @@ $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>"); <% end %> <% end %> + $('#score_<%= work.id%>').peSlider({range: 'min'}); <% end %> - $('#score_<%= work.id%>').peSlider({range: 'min'}); <% end %> }); \ No newline at end of file diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 81627f9d6..d89b44651 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -130,58 +130,86 @@ <% if activity.student_works.count != 0 %> <% sw = activity.student_works.reorder("created_at desc").first %>
    - <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 + # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
    <% end %>
    <% if activity.student_works.count != 0 %> <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %> -
    - <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    +

    # <%=time_from_now last_score.created_at %> + <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行： +

    + <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %> + <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %> + <% student_works.each_with_index do |sw, i| %> +
    + <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %> + + + <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %> +

    分数：<%=format("%.1f",score<0 ? 0 : score) %>分

    +
    + <% if i == 4 %> + <% break %> + <% end %> + <% end %> + <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%> +
    <% end %> <% end %>
    <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> -
    <% projects = activity.student_work_projects.where("is_leader = 1") %> -
    - 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> -
    -
    - <% projects.each do |pro| %> - <% project = Project.find pro.project_id %> - + -
    - <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> +
    + <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

    +
    + 项目名称：<%=project.name %>
    + 创建者：<%=(User.find project.user_id).show_name %>(组长)
    + 更新时间：<%=time_from_now time %> +
    +
    + <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

    <%=(User.find project.user_id).show_name %>(组长)

    -

    <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

    -
    - 项目名称：<%=project.name %>
    - 创建者：<%=(User.find project.user_id).show_name %>(组长)
    - 更新时间：<%=time_from_now time %> -
    <% end %> -
    <% end %>
    <% if is_teacher%> @@ -313,5 +341,14 @@
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 8c4a8ac0d..b12f1c0af 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -132,59 +132,87 @@ <% if homework_common.student_works.count != 0 %> <% sw = homework_common.student_works.reorder("created_at desc").first %>
    - <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 + # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
    <% end %>
    <% if homework_common.student_works.count != 0 %> - <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> - <% unless student_work_scores.empty? %> + <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %> -
    - <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 -
    - <% end %> - <% end %> -
    - <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %> -
    - <% projects = homework_common.student_work_projects.where("is_leader = 1") %> -
    - 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> -
    -
    - <% projects.each do |pro| %> - <% project = Project.find pro.project_id %> - -
    - <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %> - <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

    <%=(User.find project.user_id).show_name %>(组长)

    - -

    <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

    -
    - 项目名称：<%=project.name %>
    - 创建者：<%=(User.find project.user_id).show_name %>(组长)
    - 更新时间：<%=time_from_now time %> +
    +

    # <%=time_from_now last_score.created_at %> + <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行： +

    + <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %> + <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %> + <% student_works.each_with_index do |sw, i| %> +
    + <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %> + + + <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %> +

    分数：<%=format("%.1f",score<0 ? 0 : score) %>分

    -
    - <% end %> -
    - <% end %> + <% if i == 4 %> + <% break %> + <% end %> + <% end %> + <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%> +
    +
    + <% end %> + <% end %> +
    + <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %> + <% projects = homework_common.student_work_projects.where("is_leader = 1") %> + <% unless projects.empty? %> + <% sort_projects = project_sort_update projects %> +
    +
    + # <%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_path(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新： +
    +
    + <% sort_projects.each_with_index do |pro, i| %> + <% project = Project.find pro.project_id %> + + +
    + <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

    +
    + 项目名称：<%=project.name %>
    + 创建者：<%=(User.find project.user_id).show_name %>(组长)
    + 更新时间：<%=time_from_now time %> +
    +
    + <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> + <% end %> +
    + <% end %> + <% end %>
    <% if is_teacher%> <% comment_status = homework_common.homework_detail_manual.comment_status%> @@ -315,5 +343,14 @@
    \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 045455bb7..e0bd1d6f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1366,6 +1366,7 @@ ActiveRecord::Schema.define(:version => 20160114131753) do t.integer "changeset_num", :default => 0 t.integer "board_message_num", :default => 0 t.integer "board_num", :default => 0 + t.integer "act_num", :default => 0 t.integer "attach_num", :default => 0 end diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 16ef3c5df..841392cea 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1221,7 +1221,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} -.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} +.captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} @@ -1257,3 +1257,6 @@ div.disable_link {background-color: #c1c1c1 !important;} .fn {font-weight:normal} .boutiqueP {position:absolute; left:0px; top:0px;} + +.mh18 {max-height: 18px;} +.relatePWrap{max-height: 210px;overflow:hidden;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ac9b50d0f..8d935e70e 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -77,6 +77,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .ml36{ margin-left:36px; } .ml40{ margin-left:40px;} .ml45{ margin-left:45px;} +.ml50{ margin-left: 50px;} .ml55{ margin-left:55px;} .ml30{ margin-left:30px;} .ml60{ margin-left:60px;} @@ -95,6 +96,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .mr20{ margin-right:20px;} .mr30{ margin-right:30px !important;} .mr40{ margin-right:40px !important;} +.mr65 {margin-right: 65px;} .mw20{ margin: 0 20px;} .mt-20 {margin-top:-20px;} .mt-4 {margin-top: -4px;} @@ -121,6 +123,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .w70{ width:70px;} .w80{ width:80px;} .w90{ width:90px;} +.w100 {width: 100px;} .w110{width:110px;} .w210{ width:210px;} .w150{ width:150px;} @@ -581,7 +584,7 @@ a.homepageImageNumber:hover {color:#269ac9;} .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;} .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;} -a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} +a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} @@ -1416,3 +1419,4 @@ span.at a{color:#269ac9;text-decoration: none;} .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;} .orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;} +.relatePWrap{max-height: 210px;overflow:hidden;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 87097a052..234905c7a 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml40{ margin-left:40px;} .ml45{ margin-left:45px;} .ml48{ margin-left:48px;} +.ml50{ margin-left: 50px;} .ml53{margin-left:53px;} .ml55{ margin-left:55px;} .ml58{margin-left:58px;} @@ -102,6 +103,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mr50{margin-right: 50px;} .mr55{margin-right: 55px;} .mr60 {margin-right:60px;} +.mr65 {margin-right:65px;} .mr70{margin-right: 70px;} .mw15{margin:0 15px;} .mr90 {margin-right:90px;} @@ -113,6 +115,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mt5{ margin-top:5px;} .mt8{ margin-top:8px;} .mt10{ margin-top:10px !important;} +.mt20{margin-top: 20px;} .mt30{ margin-top: 30px;} .mt40{ margin-top: 40px;} .mt12 { margin-top:12px !important;} @@ -168,6 +171,7 @@ h4{ font-size:14px; color:#3b3b3b;} .h150{ height:150px;} .p10 {padding-left:10px; padding-right:10px;} .mw400 {max-width: 400px;} +.mh18 {max-height: 18px;} /* Font & background Color */ a.b_grey{ background: #F5F5F5;} @@ -1004,3 +1008,5 @@ a:hover.userCancel{border:1px solid #888888; } .userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;} .userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;} .resourceCopy {padding:0px; margin:0px; width:12px; height:12px; display:inline-block;} + +.relatePWrap{max-height: 210px;overflow:hidden;} From 03df9abfebb35fa5c780766e0d1c0cd1dd09bb9d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 18 Jan 2016 10:43:22 +0800 Subject: [PATCH 76/84] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_subfields_controller.rb | 6 ++++- app/controllers/organizations_controller.rb | 4 +++ .../organizations/check_uniq_domain.js.erb | 5 ++++ app/views/organizations/setting.html.erb | 25 +++++++++++++++---- config/routes.rb | 1 + 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 app/views/organizations/check_uniq_domain.js.erb diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 9f1d964ef..d051a91f7 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -27,7 +27,11 @@ class OrgSubfieldsController < ApplicationController @sort = "" @order = "" @is_remote = false - @organization = Organization.find(params[:id]) + if params[:id] + @organization = Organization.find(params[:id]) + else + @organization = Organization.where("domain=?",request.subdomain).first + end @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+ "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+ " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index b431678af..39ece6fbe 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -136,6 +136,10 @@ class OrganizationsController < ApplicationController end end + def check_uniq_domain + @is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0) + end + def find_organization @organization = Organization.find(params[:id]) end diff --git a/app/views/organizations/check_uniq_domain.js.erb b/app/views/organizations/check_uniq_domain.js.erb new file mode 100644 index 000000000..e49bb0cad --- /dev/null +++ b/app/views/organizations/check_uniq_domain.js.erb @@ -0,0 +1,5 @@ +<% if @is_exist %> + $is_exist = true; +<% else %> + $is_exist = false; +<% end %> \ No newline at end of file diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index 962a7a497..45ac302ca 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -149,18 +149,33 @@ if ($("#subfield_name").val().trim() != "") $("#add_subfield_form").submit(); } + var $is_exist = false; function apply_subdomain(id, domain){ var reg = new RegExp("^[a-zA-Z0-9_]{1,}$"); if (reg.exec(domain)){ $.ajax({ - url:"<%= apply_subdomain_organization_path %>", - type:'post', + url: "<%= check_uniq_domain_organizations_path %>", + type: 'get', data:{ - id:id, - domain:domain + org_domain:domain }, success:function(){ - $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果"); + if(!$is_exist){ + $.ajax({ + url:"<%= apply_subdomain_organization_path %>", + type:'post', + data:{ + id:id, + domain:domain + }, + success:function(){ + $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果"); + } + }); + } + else{ + $("#apply_hint").text("您申请的子域名已存在，请重新输入"); + } } }); } diff --git a/config/routes.rb b/config/routes.rb index ce5b09aec..67694edb7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do end collection do get 'check_uniq' + get 'check_uniq_domain' get 'autocomplete_search' post 'hide_org_subfield' post 'show_org_subfield' From 5e102d24dd2f6d50dcc7ac51cd8991a3bbfca2d2 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 18 Jan 2016 11:01:04 +0800 Subject: [PATCH 77/84] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E6=8A=A5500=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/blogs/_article.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 22df4499a..0516a431a 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -78,7 +78,7 @@ 发帖时间：<%= format_time(activity.created_on) %>
    - 更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %> + 更新时间：<%= format_time(activity.updated_on) %>
    From 909e0e846b09a0fa24f3ddfd34c2e0c3907cc9a1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 18 Jan 2016 11:06:08 +0800 Subject: [PATCH 78/84] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index cdf715a0e..ccbe67004 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,7 +74,7 @@ RedmineApp::Application.routes.draw do end end - get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' + constraints(Subdomain.new) do get '/', to: 'organizations#show' end @@ -1125,6 +1125,8 @@ RedmineApp::Application.routes.draw do resources :at + get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id' + Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir| file = File.join(plugin_dir, "config/routes.rb") if File.exists?(file) From 9cabb0248a955797a2ca7b94872424ffd16ae7d2 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Jan 2016 15:12:47 +0800 Subject: [PATCH 79/84] =?UTF-8?q?=E5=B7=B2=E7=82=B9=E8=BF=87=E8=B5=9E?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=E2=80=9D=E5=B7=B2?= =?UTF-8?q?=E8=B5=9E=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/praise_tread_controller.rb | 7 +++++-- app/views/praise_tread/_praise.html.erb | 10 ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb index b99963e2f..291a71f26 100644 --- a/app/controllers/praise_tread_controller.rb +++ b/app/controllers/praise_tread_controller.rb @@ -24,7 +24,7 @@ class PraiseTreadController < ApplicationController end return end - #@horizontal = params[:horizontal].downcase == "false" ? false:true + @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal] if @obj.respond_to?("author_id") author_id = @obj.author_id elsif @obj.respond_to?("user_id") @@ -127,6 +127,8 @@ class PraiseTreadController < ApplicationController @obj = Comment.find_by_id(id) when 'Journal' @obj = Journal.find_by_id(id) + else + @obj = nil end return @obj end @@ -143,7 +145,8 @@ class PraiseTreadController < ApplicationController # end #再创建或更新praise_tread_cache表 - @ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type) + #@ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type) + @ptc = PraiseTreadCache.where("object_id = ? and object_type = ?",id.to_i,type).first @ptc = @ptc.nil? ? PraiseTreadCache.new : @ptc @ptc.object_id = id.to_i @ptc.object_type = type diff --git a/app/views/praise_tread/_praise.html.erb b/app/views/praise_tread/_praise.html.erb index 4fd961251..63b57f8a6 100644 --- a/app/views/praise_tread/_praise.html.erb +++ b/app/views/praise_tread/_praise.html.erb @@ -1,7 +1,13 @@ <% if PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",activity.id,activity.class.to_s,User.current.id).empty? %> + 赞 + <% num = get_praise_num(activity) %> + <%= num > 0 ? "（#{num}）" : "" %> + <% else %> + 已赞 + <% num = get_praise_num(activity) %> + <%= num > 0 ? "（#{num}）" : "" %> + <% end %> \ No newline at end of file From c5935a6a465fa647895c0d0a7253668e3ffa2a26 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Jan 2016 15:52:38 +0800 Subject: [PATCH 80/84] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/praise_tread_controller.rb | 54 +++++++++++----------- app/views/blogs/_article.html.erb | 32 +++++++++++-- app/views/users/_user_blog.html.erb | 30 ++++++++++-- 3 files changed, 81 insertions(+), 35 deletions(-) diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb index 291a71f26..1a01a2f07 100644 --- a/app/controllers/praise_tread_controller.rb +++ b/app/controllers/praise_tread_controller.rb @@ -103,32 +103,34 @@ class PraiseTreadController < ApplicationController def find_object_by_type_and_id(type,id) @obj = nil case type - when 'User' - @obj = User.find_by_id(id) - when 'Issue' - @obj = Issue.find_by_id(id) - when 'Project' - @obj = Project.find_by_id(id) - when 'Bid' - @obj = Bid.find_by_id(id) - when 'Contest' - @obj = Contest.find_by_id(id) - when 'Memo' - @obj = Memo.find_by_id(id) - when 'Message' - @obj = Message.find_by_id(id) - when 'HomeworkCommon' - @obj = HomeworkCommon.find_by_id(id) - when 'JournalsForMessage' - @obj = JournalsForMessage.find_by_id(id) - when 'News' - @obj = News.find_by_id(id) - when 'Comment' - @obj = Comment.find_by_id(id) - when 'Journal' - @obj = Journal.find_by_id(id) - else - @obj = nil + when 'Memo' + @obj = Memo.find_by_id(id) + when 'Message' + @obj = Message.find_by_id(id) + when 'HomeworkCommon' + @obj = HomeworkCommon.find_by_id(id) + when 'JournalsForMessage' + @obj = JournalsForMessage.find_by_id(id) + when 'News' + @obj = News.find_by_id(id) + when 'Comment' + @obj = Comment.find_by_id(id) + when 'Journal' + @obj = Journal.find_by_id(id) + when 'BlogComment' + @obj = BlogComment.find_by_id(id) + when 'User' + @obj = User.find_by_id(id) + when 'Issue' + @obj = Issue.find_by_id(id) + when 'Project' + @obj = Project.find_by_id(id) + when 'Bid' + @obj = Bid.find_by_id(id) + when 'Contest' + @obj = Contest.find_by_id(id) + else + @obj = nil end return @obj end diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 22df4499a..2c18a144c 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -125,11 +125,17 @@ <% count=activity.children.count%> <% end %>
    -
    -
    -
    回复( - <%= count %> - )
    +
    +
    回复 + <%= count>0 ? "（#{count}）" : "" %>▪ + + <% if activity.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> + <% end %> + +
    <%#=format_date(activity.updated_on)%>
    <%if count > 3 %>
    @@ -164,6 +170,13 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% end %> <%= format_time(reply.created_on) %> + + <% if reply.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> + <% end %> +
    <%= reply.content.html_safe %> @@ -203,5 +216,14 @@
    diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index 3ce0926a8..440bcb773 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -50,10 +50,16 @@
    <% count=activity.children.count %>
    -
    -
    -
    - 回复（<%= count %>） +
    +
    回复 + <%= count>0 ? "（#{count}）" : "" %>▪ + + <% if activity.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> + <% end %> +
    <%#= format_date(activity.updated_on) %>
    <%if count>3 %> @@ -88,6 +94,13 @@ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_time(comment.created_on) %> + + <% if comment.author == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + <% end %> +
    <%= comment.content.html_safe %>
    @@ -126,5 +139,14 @@
    From b4521d3582579eb14201123367f34462a1330f7c Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Jan 2016 16:18:40 +0800 Subject: [PATCH 81/84] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E6=9B=B4=E5=A4=9A=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_courses.html.erb | 5 ++++- app/views/layouts/base_projects.html.erb | 4 ++++ app/views/projects/_development_group.html.erb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index cb5c2502f..4e3d10558 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -126,7 +126,7 @@ <%# 工具栏展开 %> <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 || course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 %> - + @@ -292,6 +292,9 @@ obj.parent().parent().next("div").hide(); } + $("#expand_tools_expand").click(function(){ + $("#navContentCourse").toggle(); + }); \ No newline at end of file diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 58289b352..b7e8a5d6d 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -245,6 +245,10 @@ $('#ajax-modal').parent().css("top","40%").css("left","36%"); $('#ajax-modal').parent().addClass("popbox_polls"); } + + $("#expand_tools_expand").click(function(){ + $("#navContent").toggle(); + });
    diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 95d0fccf6..6cac445ee 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -54,7 +54,7 @@
    <% end %> - + From 6e582fa631f57f9093a6bb23ab9055b97e6fa129 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 19 Jan 2016 09:55:28 +0800 Subject: [PATCH 82/84] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=AF=84=E9=98=85?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=B8=8D=E5=86=99?= =?UTF-8?q?=E8=AF=84=E8=AF=AD=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E7=9A=84=E6=97=B6=E5=80=99=E6=89=8D=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=86=99=E8=AF=84=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_add_score.html.erb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index 052443155..9d747790f 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -23,13 +23,17 @@ <% end%> \ No newline at end of file From 8e9c4bab6b0add76007314c9dde797682f2eac9d Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 19 Jan 2016 10:08:28 +0800 Subject: [PATCH 83/84] =?UTF-8?q?=E8=B5=9E=E5=A2=9E=E5=8A=A0tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blogs/_article.html.erb | 4 ++-- app/views/organizations/_org_course_homework.html.erb | 4 ++-- app/views/organizations/_org_course_message.html.erb | 4 ++-- app/views/organizations/_org_course_news.html.erb | 4 ++-- app/views/organizations/_org_project_issue.html.erb | 4 ++-- app/views/organizations/_org_subfield_message.html.erb | 4 ++-- app/views/organizations/_project_message.html.erb | 4 ++-- app/views/projects/_project_news.html.erb | 4 ++-- app/views/users/_course_homework.html.erb | 4 ++-- app/views/users/_course_message.html.erb | 4 ++-- app/views/users/_course_news.html.erb | 4 ++-- app/views/users/_project_issue.html.erb | 4 ++-- app/views/users/_project_message.html.erb | 4 ++-- app/views/users/_user_blog.html.erb | 4 ++-- app/views/users/_user_homework_detail.html.erb | 4 ++-- app/views/users/_user_journalsformessage.html.erb | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index d6ce215c6..afe89362f 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -130,7 +130,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -172,7 +172,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 50d4a07db..56c19f994 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -256,7 +256,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -297,7 +297,7 @@ <%= format_time(comment.created_on) %> <% if comment.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb index 55be0bf91..79b9bbe05 100644 --- a/app/views/organizations/_org_course_message.html.erb +++ b/app/views/organizations/_org_course_message.html.erb @@ -77,7 +77,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -119,7 +119,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb index ddad08279..7d6940f52 100644 --- a/app/views/organizations/_org_course_news.html.erb +++ b/app/views/organizations/_org_course_news.html.erb @@ -49,7 +49,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -90,7 +90,7 @@ <%= format_time(comment.created_on) %> <% if comment.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb index 9c1863992..78964efbe 100644 --- a/app/views/organizations/_org_project_issue.html.erb +++ b/app/views/organizations/_org_project_issue.html.erb @@ -62,7 +62,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -103,7 +103,7 @@ <%= format_time(reply.created_on) %> <% if reply.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb index 901c2ecf4..f8f412732 100644 --- a/app/views/organizations/_org_subfield_message.html.erb +++ b/app/views/organizations/_org_subfield_message.html.erb @@ -62,7 +62,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -99,7 +99,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index c7d99c5fb..d15ceca38 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -62,7 +62,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -100,7 +100,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb index 2e7b1316a..ceee318a4 100644 --- a/app/views/projects/_project_news.html.erb +++ b/app/views/projects/_project_news.html.erb @@ -49,7 +49,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -90,7 +90,7 @@ <%= format_time(comment.created_on) %> <% if comment.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index d89b44651..f73e039f9 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -256,7 +256,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -297,7 +297,7 @@ <%= format_time(comment.created_on) %> <% if comment.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index d8268d698..bc14793db 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -97,7 +97,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -139,7 +139,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index ddad08279..7d6940f52 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -49,7 +49,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -90,7 +90,7 @@ <%= format_time(comment.created_on) %> <% if comment.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 954c24dac..6f1fc8b7a 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -74,7 +74,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -115,7 +115,7 @@ <%= format_time(reply.created_on) %> <% if reply.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 75940b32c..ab7502bd5 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -96,7 +96,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -134,7 +134,7 @@ <%= format_time(reply.created_on) %> <% if reply.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index 440bcb773..1a4b90768 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -55,7 +55,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -96,7 +96,7 @@ <%= format_time(comment.created_on) %> <% if comment.author == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 652d2aca8..d1b3f62fc 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -260,7 +260,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if homework_common.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%> <% end %> @@ -300,7 +300,7 @@ <% end %> <%= format_time(comment.created_on) %> <% if comment.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index dd55155d0..609b1e35b 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -40,7 +40,7 @@ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%> <% end %> @@ -76,7 +76,7 @@ <%= format_time(comment.created_on) %> <% if comment.user == User.current %> - + <% else %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> <% end %> From e293805488570ccd8705692133ed623fe9b69f1e Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 19 Jan 2016 15:41:53 +0800 Subject: [PATCH 84/84] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=E8=8B=A5=E6=9C=AA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=88=99=E7=9B=B4=E6=8E=A5=E8=B7=B3=E5=88=B0=E7=99=BB=E5=BD=95?= =?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/controllers/poll_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index ec54ae8a4..78babc43c 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -2,6 +2,7 @@ class PollController < ApplicationController before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result,:close_poll,:export_poll] before_filter :find_container, :only => [:new,:create, :index] + before_filter :is_logged, :only => [:index, :show, :poll_result,:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll,:commit_answer,:commit_poll,:statistics_result] before_filter :is_member_of_course, :only => [:index,:show,:poll_result] before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll] include PollHelper @@ -503,6 +504,10 @@ class PollController < ApplicationController end end + def is_logged + redirect_to signin_path unless User.current.logged? + end + def is_member_of_course render_403 unless(@course && (User.current.member_of_course?(@course) || User.current.admin?)) end