From b259f923816b23618d76a67e752a654926fa0b62 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 9 Oct 2016 09:02:12 +0800 Subject: [PATCH 01/41] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA5?= =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 10 +++++ .../_org_left_subfield_list.html.erb | 41 +++++++++---------- .../organizations/_org_subdomain.html.erb | 13 +++--- .../organizations/more_org_submains.js.erb | 1 + config/routes.rb | 1 + public/javascripts/org.js | 11 +++++ 6 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 app/views/organizations/more_org_submains.js.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 2b31cae13..edffdd28b 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -460,6 +460,16 @@ class OrganizationsController < ApplicationController @members = paginateHelper @members, 20 end + def more_org_submains + @org_subfield = OrgSubfield.find params[:org_subfield_id].to_i + + @page = params[:page] + @submains = @org_subfield.sub_domains.reorder('priority').uniq.page((params[:page].to_i || 1) +1).per(5) + respond_to do |format| + format.js + end + end + def more_org_projects @organization = Organization.find params[:id] @page = params[:page] diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index 11f45ede1..ee467067b 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -43,12 +43,11 @@ $(this).prev().css("color","#808080"); $(this).css("z-index", "1"); }); - //二级菜单滑动时箭头方向控制 $(".homepageLeftMenuMoreIcon").toggle(function(){ - $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat"); - },function(){ $(this).css("background","url(/images/homepage_icon.png) -74px -240px no-repeat"); + },function(){ + $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat"); }); }) @@ -103,17 +102,15 @@ <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %> <% end %> <% else %> - - <%= field.name %> + <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %> <% end %> <% if User.current.logged? and User.current.admin_of_org?(organization) %> <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %> <% end %> -
- +
@@ -139,20 +136,20 @@
<% elsif field.field_type == "Resource" %>
- <% if !field.subfield_subdomain_dir.nil? %> - <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %> - <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %> - <% else %> - <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %> - <% end %> - <% else %> - <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %> - <% 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 => "上传资源" %> - - <% end %> - + <% if !field.subfield_subdomain_dir.nil? %> + <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %> + <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %> + <% else %> + <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %> + <% end %> + <% else %> + <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %> + <% 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 => "上传资源" %> + + <% end %> +
<% end %> diff --git a/app/views/organizations/_org_subdomain.html.erb b/app/views/organizations/_org_subdomain.html.erb index b096a14ae..8b8807533 100644 --- a/app/views/organizations/_org_subdomain.html.erb +++ b/app/views/organizations/_org_subdomain.html.erb @@ -3,9 +3,10 @@ <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %> <% end %> -<%# if subdomains.size == 5 %> - - - - -<%# end%> \ No newline at end of file +<% if subdomains.size == 5 %> +
  • + + +
    • +<% end%> + diff --git a/app/views/organizations/more_org_submains.js.erb b/app/views/organizations/more_org_submains.js.erb new file mode 100644 index 000000000..088c9ed34 --- /dev/null +++ b/app/views/organizations/more_org_submains.js.erb @@ -0,0 +1 @@ +$("#show_more_org_submains").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_subdomain',:locals => {:subdomains => @submains, :org_subfield_id => @org_subfield.id, :page=> @page, :org_id => @organization } )%>"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4ff75cbf9..633ce465c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,7 @@ RedmineApp::Application.routes.draw do put 'set_homepage' put 'cancel_homepage' get 'members' + get 'more_org_submains' get 'more_org_projects' get 'more_org_courses' get 'search_courses' diff --git a/public/javascripts/org.js b/public/javascripts/org.js index f1520a0ec..84711cded 100644 --- a/public/javascripts/org.js +++ b/public/javascripts/org.js @@ -34,6 +34,17 @@ function observeSearchfield(fieldId, targetId, url) { }); } +//显示更多子栏目 +function show_more_org_submain(url){ + $.get( + url, + { page: $("#org_submains_page_num").val() }, + function (data) { + + } + ); +} + //显示更多的项目 function show_more_org_project(url){ $.get( From dd4d20011ddefa1dca1e9df59db97e6ce05a3780 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 13 Oct 2016 09:43:53 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- app/views/layouts/_logined_header.html.erb | 2 +- app/views/users/user_resource.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 78c60599a..556b1ed1b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3056,7 +3056,7 @@ class UsersController < ApplicationController user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id } # user_org_ids = User.current.organizations.map {|o| o.id} - if( params[:type] == "1") # 我的资源 + if(params[:type].blank? || params[:type] == "1") # 我的资源 # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源 if params[:status] == "2" @attachments = get_course_resources(params[:id], user_course_ids, @order, @score) @@ -3070,7 +3070,7 @@ class UsersController < ApplicationController # 公共资源库：所有公开资源或者我上传的私有资源 @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score) end - elsif (params[:type].blank? || params[:type] == "6") # 公共资源 + elsif (params[:type] == "6") # 公共资源 if params[:status] == "2" @attachments = get_course_resources_public( user_course_ids, @order, @score) elsif params[:status] == "3" diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index b8235ff1c..4e501b2eb 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -8,7 +8,7 @@ <%= link_to "首页",user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页"%>
  • - <%= link_to "资源库", user_resource_user_path(User.current, :type => 6), :class => "c_white f16 db p10" %> + <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10" %>
    • <% if hidden_unproject_infos %>
  • diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 6c0e067db..7fe945df9 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -45,10 +45,10 @@
    • - 公共资源 + 我的资源
    • - 我的资源 + 公共资源
      • From 39cc6c36eaa8678b9e1b4fee20f0b0dcabef9d4b Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 13 Oct 2016 10:17:54 +0800 Subject: [PATCH 03/41] =?UTF-8?q?issue=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes.html.erb | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index f7d7b4d50..0c7aa9ec5 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -24,15 +24,15 @@ <% end %>
      -
    • - - -
      • -
      + + + + + + + + +
    • <% if @issue.safe_attribute? 'assigned_to_id' %> @@ -85,13 +85,6 @@ <% end %>
      • -
    • - - <% if @issue.safe_attribute? 'estimated_hours' %> - <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true %> - <% end %> -
      • -
    • <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %> <%= f.select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }), From c26af37456256596b0da7b6563b3933975b7c789 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Oct 2016 09:29:53 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8C=89=E7=8A=B6=E6=80=81=E8=BF=9B=E8=A1=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=E6=B8=B8=E5=AE=A2=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=EF=BC=8C=E7=8F=AD=E7=BA=A7=E7=95=99=E8=A8=80=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E2=80=9C+"=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 7 ++++++- app/views/courses/_tool_expand.html.erb | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 01f16bc46..dce558ac4 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -43,7 +43,12 @@ class AdminController < ApplicationController # 搜索功能 @name = params[:name] || "" condition = "#{@name.strip}".gsub(" ","") - @projects = Project.like(condition).order('created_on desc') + @status = params[:status] || "" + unless @status.empty? + @projects = Project.where(:status=>@status).like(condition).order('created_on desc') + else + @projects = Project.like(condition).order('created_on desc') + end # 分页 @projects = paginateHelper @projects,30 @page = (params['page'] || 1).to_i - 1 diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index e5fcd8314..893ea0cea 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -29,7 +29,9 @@ <% if show_nav?(course_feedback_count) %>
    • 留言 + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%> + <% end %>
      • <% end %> <% if show_nav?(course_poll_count) %> From db63a5514dfdc608940a78d8a025bb118c992dbc Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 13:45:47 +0800 Subject: [PATCH 05/41] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=8A=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 32 +++++--- .../_show_attachment_history.html.erb | 75 +++---------------- .../_upload_attachment_new_version.html.erb | 8 +- .../attachments/attachment_versions.js.erb | 18 +++-- app/views/attachments/destroy.js.erb | 5 ++ .../files/_attachment_history_popub.html.erb | 57 ++++++++++++++ app/views/layouts/base_projects.html.erb | 2 +- public/stylesheets/css/moduel.css | 59 +++++++++++++++ public/stylesheets/css/project.css | 5 +- 9 files changed, 174 insertions(+), 87 deletions(-) create mode 100644 app/views/files/_attachment_history_popub.html.erb create mode 100644 public/stylesheets/css/moduel.css diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 3986acc0a..752ff985f 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -329,20 +329,33 @@ class AttachmentsController < ApplicationController end end + # prams[:type] => history 历史版本 def destroy - if @attachment.container.respond_to?(:init_journal) - @attachment.container.init_journal(User.current) - end - if @attachment.container - if @attachment.container_type == "Issue" - @attachment.destroy - else - @attachment.container.attachments.delete(@attachment) + if params[:type] == "history" + begin + AttachmentHistory.find(params[:history_id]).destroy + @attachment = Attachment.find(params[:id]) + @is_history = true + @attachment_histories = @attachment.attachment_histories + rescue Exception => e + puts e end else - @attachment.destroy + if @attachment.container.respond_to?(:init_journal) + @attachment.container.init_journal(User.current) + end + if @attachment.container + if @attachment.container_type == "Issue" + @attachment.destroy + else + @attachment.container.attachments.delete(@attachment) + end + else + @attachment.destroy + end end + respond_to do |format| if !@attachment.container.nil? && (@attachment.container.is_a?(Course) || ((@attachment.container.has_attribute?(:course) || @attachment.container.has_attribute?(:course_id) ) && @@ -631,6 +644,7 @@ class AttachmentsController < ApplicationController #找到文件的所有的历史版本 def attachment_versions + @project = Project.find(params[:project_id]) @attachment = Attachment.find(params[:id]) @attachment_histories = @attachment.attachment_histories respond_to do |format| diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb index db2cbdec6..9a1a278fc 100644 --- a/app/views/attachments/_show_attachment_history.html.erb +++ b/app/views/attachments/_show_attachment_history.html.erb @@ -1,66 +1,11 @@ - -更新资源版本 - -
      -
      -
      当前版本 - - - -
      - <% unless @attachment_histories.empty? %> - -
      历史版本
      -
      - <% @attachment_histories.each do |history| %> - - <%= link_to truncate(history.filename,length: 35, omission: '...'), - download_history_attachment_path(history.id, history.filename), - :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b upload_filename fl" %> - 版本号：<%= history.version %> -
      -       - - <% end %> -
      - <% end %> - -
      - <%= form_tag(upload_attachment_version_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %> - <%= hidden_field_tag :old_attachment_id,@attachment.id %> -
      - - -
      -
      - - <%= render :partial => 'attachments/upload_attachment_new_version' %> -
      - - -
      -
      - (未选择文件) - 您可以上传小于50MB的文件 -
      -
      -
      -

      描述：

      -
      - -
      -
      -
      -
      -
      -
      -
      -
      - - <%= submit_tag '确定',:onclick=>'upload_attachment_version(event);',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %> -
      -
      取消
      -
      - <% end %> +
      +

      更新资源版本

      +
      - \ No newline at end of file +
      +
      + +
      + <%= render :partial => "files/attachment_history_popub" %> +
      +
      diff --git a/app/views/attachments/_upload_attachment_new_version.html.erb b/app/views/attachments/_upload_attachment_new_version.html.erb index cd35535c0..0e03bab47 100644 --- a/app/views/attachments/_upload_attachment_new_version.html.erb +++ b/app/views/attachments/_upload_attachment_new_version.html.erb @@ -1,8 +1,8 @@ +
      + 文件浏览 +

      (未选择文件) 您可以上传小于50MB的文件

      +
      - - - - 选择文件 <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => ie8? ? '':'file_selector', diff --git a/app/views/attachments/attachment_versions.js.erb b/app/views/attachments/attachment_versions.js.erb index ff704a869..c924c542a 100644 --- a/app/views/attachments/attachment_versions.js.erb +++ b/app/views/attachments/attachment_versions.js.erb @@ -1,7 +1,11 @@ -$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/show_attachment_history' )%>'); -showModal('ajax-modal', '452px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before(""); -$('#ajax-modal').parent().css("top","40%").css("left","50%").css("position","fixed"); -$('#ajax-modal').parent().addClass("resourceUploadPopup"); -$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); \ No newline at end of file +//$("#ajax-modal").html('<%#= escape_javascript( render :partial => 'attachments/show_attachment_history' )%>'); +//showModal('ajax-modal', '452px'); +//$('#ajax-modal').siblings().remove(); +//$('#ajax-modal').before(""); +//$('#ajax-modal').parent().css("top","40%").css("left","50%").css("position","fixed"); +//$('#ajax-modal').parent().addClass("resourceUploadPopup"); +//$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); + + +var htmlvalue = "<%= escape_javascript(render :partial => 'attachments/show_attachment_history') %>"; +pop_box_new(htmlvalue,820,360); \ No newline at end of file diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb index 02a613e6e..310ad74d5 100644 --- a/app/views/attachments/destroy.js.erb +++ b/app/views/attachments/destroy.js.erb @@ -1,3 +1,8 @@ +//历史版本删除局部刷新 +<% if @is_history %> +$("#attachment_history_popub").html('<%= escape_javascript( render :partial => 'files/attachment_history_popub') %>'); +<% end %> + <% if @is_destroy%> $("#attachment_<%= @attachment.id%>").remove(); if(document.getElementById("revise_attachment_div_<%= @attachment.id%>")) { diff --git a/app/views/files/_attachment_history_popub.html.erb b/app/views/files/_attachment_history_popub.html.erb new file mode 100644 index 000000000..871264f5a --- /dev/null +++ b/app/views/files/_attachment_history_popub.html.erb @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + <% @attachment_histories.each do |history| %> + + + + + + + + <% end %> + +
      资源名称下载数引用数版本号

      <%= @attachment.filename %>当前版本

      		<%= @attachment.downloads %><%= @attachment.quotes %><%= format_time(@attachment.created_on) %>

      + <%= link_to history.filename, download_history_attachment_path(history.id, history.filename), :title => history.filename+"\n"+history.description.to_s %>

      +       		<%= history.downloads %><%= history.try(:quotes).to_i %><%= format_time(history.created_on) %> + <%= link_to( '删除资源', attachment_path(history.attachment, :history_id => history, :type => "history"), + :remote => true, + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete,:class => "postOptionLink", + :class => "btn") if (is_project_manager?(User.current.id, @project.id) || User.current.id == history.author_id) %> +
      +<%= form_tag(upload_attachment_version_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %> + <%= hidden_field_tag :old_attachment_id,@attachment.id %> +
      + + +
      +
      + + <%= render :partial => 'attachments/upload_attachment_new_version' %> +
      + + +
      +
      + +
      + <%= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %> + 取消 +
      +<% end %> \ 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 fced40737..218ef3fcf 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -12,7 +12,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository','css/gantt', 'css/calendar' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository','css/gantt', 'css/calendar', "css/moduel" %> <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %> <%= call_hook :view_layouts_base_html_head %> diff --git a/public/stylesheets/css/moduel.css b/public/stylesheets/css/moduel.css new file mode 100644 index 000000000..1e2250de8 --- /dev/null +++ b/public/stylesheets/css/moduel.css @@ -0,0 +1,59 @@ +/* 模板弹框 20161013byLB */ +#muban_popup_box{ background:#fff;padding-bottom:15px;-webkit-border-radius:5px;-moz-border-radius:5px;-o-border-radius:5px;border-radius:5px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} +.muban_popup_top{background:#3b94d6;height:40px;-webkit-border-radius: 5px 5px 0px 0px;-moz-border-radius: 5px 5px 0px 0px;-o-border-radius: 5px 5px 0px 0px;border-radius: 5px 5px 0px 0px;} +.muban_popup_top h3{ font-size:16px; color:#fff; font-weight:normal; line-height:40px; padding-left:10px; } +a.muban_icons_close{width:20px; height:20px;display:block;background: url(/images/sy/sy_icons_close.png) 0 0px no-repeat; margin:8px 10px 0 0;} +a:hover.muban_icons_close{background: url(/images/sy/sy_icons_close.png) -40px 0px no-repeat;} +/*模板表格 20161013byLB*/ +.muban_table{ width:100%; background:#fff; border:1px solid #e5e5e5; border-bottom: none; } +.muban_table thead tr{ height:40px; line-height:40px;} +.muban_table thead tr th{ border-bottom:1px solid #e5e5e5;} +.muban_table tbody tr:hover{ background:#f5f5f5;} +.muban_table tbody tr th{ height:40px; line-height:40px; border-bottom:1px solid #e5e5e5; font-weight:normal; color:#888;} +/*模板icons 20161013byLB*/ +.muban_icons_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} +.muban_icons_blue{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #3b94d6;border: 1px solid #3b94d6;} +/*模板buttons 20161013byLB*/ +.btn{display: inline-block;border:none; padding:0 10px;color: #333;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } +.btn:hover{background: #c3c3c3; color: #333;} +.btn-green{background: #60b25e; color: #fff;} +.btn-green:hover{background: #51a74f; color: #fff;} +.btn-blue{background: #3b94d6; color: #fff;} +.btn-blue:hover{background: #2788d0; color: #fff;} +.btn-orange{background:#ff7b33; color: #fff;} +.btn-orange:hover{background:#ee4a1f; color: #fff;} +.btn-line{display: inline-block;border:none; padding:0 10px;color: #333;background:#fff; border: 1px solid #d5d5d5; text-align:center;font-size: 12px; height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } +.btn-line:hover{background:#eee; } +.btn-line-green{border: 1px solid #51a74f; color: #51a74f;} +.btn-line-green:hover{ background: #51a74f; color: #fff;} +.btn-line-blue{border: 1px solid #2788d0; color: #2788d0;} +.btn-line-blue:hover{ background: #2788d0; color: #fff;} +.btn-line-orange{border: 1px solid #ee4a1f; color: #ee4a1f;} +.btn-line-orange:hover{ background: #ee4a1f; color: #fff;} +.btn-small{ padding: 0px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; color: #333;} +.btn-small:hover{background-image:linear-gradient(#ededed, #dddddd);} +.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; background:#dbdbdb;} +.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} +/*模板a标签按钮 20161013byLB*/ +a.btn{display: inline-block;border:none; padding:0 10px;color: #333;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } +a:hover.btn{background: #c3c3c3; color: #333;} +a.btn-green{background: #60b25e; color: #fff;} +a:hover.btn-green{background: #51a74f; color: #fff;} +a.btn-blue{background: #3b94d6; color: #fff;} +a:hover.btn-blue{background: #2788d0; color: #fff;} +a.btn-orange{background:#ff7b33; color: #fff;} +a:hover.btn-orange:hover{background:#ee4a1f; color: #fff;} +a.btn-line{display: inline-block;border:none; padding:0 10px;color: #333;background:#fff; border: 1px solid #d5d5d5; text-align:center;font-size: 12px; height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } +a:hover.btn-line{background:#eee; } +a.btn-line-green{border: 1px solid #51a74f; color: #51a74f;} +a:hover.btn-line-green{ background: #51a74f; color: #fff;} +a.btn-line-blue{border: 1px solid #2788d0; color: #2788d0;} +a:hover.btn-line-blue{ background: #2788d0; color: #fff;} +a.btn-line-orange{border: 1px solid #ee4a1f; color: #ee4a1f;} +a:hover.btn-line-orange{ background: #ee4a1f; color: #fff;} +a.btn-small{ padding: 0px 10px; font-size: 12px;line-height: 20px; background-image: linear-gradient(#fcfcfc, #eee); border: 1px solid #d5d5d5;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; color: #333;} +a:hover.btn-small{background-image:linear-gradient(#ededed, #dddddd);} +a.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; background:#dbdbdb;} +a:hover.sub_btn{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} +/*模板form 20161013byLB*/ +textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; color:#666; padding:5px;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 44b607b3b..e0fc22960 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -894,4 +894,7 @@ a.sy_btn_pink{ -o-border-radius:3px; border-radius:3px; } -a:hover.sy_btn_pink{ background: #e64c4c;} \ No newline at end of file +a:hover.sy_btn_pink{ background: #e64c4c;} + +/*项目历史版本删除功能*/ +.popup_ziyuan_title{ display: block; margin-left: 10px; text-align: left;width:360px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} From 12ad7c16125e6ebcb3ad26ce932edb3004f27396 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 14:28:19 +0800 Subject: [PATCH 06/41] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BA=A7=E5=AD=90=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 87 ++++++++++--- app/controllers/messages_controller.rb | 4 +- app/models/board.rb | 8 +- app/views/boards/_course_show.html.erb | 2 +- app/views/boards/create.js.erb | 5 + app/views/boards/destroy.js.erb | 5 + app/views/boards/update_name.js.erb | 5 + app/views/boards/update_position.js.erb | 5 + app/views/courses/_tool_expand.html.erb | 14 ++- app/views/courses/settings.html.erb | 7 ++ .../courses/settings/_boards_setting.html.erb | 115 ++++++++++++++++++ .../layouts/_board_children_list.html.erb | 11 ++ app/views/layouts/base_courses.html.erb | 8 +- app/views/messages/_course_new.html.erb | 4 +- app/views/users/_course_message.html.erb | 2 +- config/routes.rb | 2 + public/javascripts/course.js | 2 +- public/stylesheets/css/common.css | 1 + 18 files changed, 259 insertions(+), 28 deletions(-) create mode 100644 app/views/boards/create.js.erb create mode 100644 app/views/boards/destroy.js.erb create mode 100644 app/views/boards/update_name.js.erb create mode 100644 app/views/boards/update_position.js.erb create mode 100644 app/views/courses/settings/_boards_setting.html.erb create mode 100644 app/views/layouts/_board_children_list.html.erb diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 099e9404a..79ac5db44 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -19,7 +19,7 @@ class BoardsController < ApplicationController layout 'base_projects'#by young default_search_scope :messages before_filter :find_project_by_project_id, :find_board_if_available, :except => [:join_to_org_subfields] - before_filter :authorize, :except => [:new, :show, :create, :index, :join_to_org_subfields] + before_filter :authorize, :except => [:new, :show, :create, :index, :join_to_org_subfields, :update_position, :update_name] accept_rss_auth :index, :show @@ -56,8 +56,12 @@ class BoardsController < ApplicationController @boards = @course.boards.includes(:last_message => :author).all end end - unless @course.boards.empty? - @board = @course.boards.first + if params[:board_id] + @board = Board.find params[:board_id].to_i + else + unless @course.boards.where("parent_id is NULL").empty? + @board = @course.boards.where("parent_id is NULL").first + end end show and return else @@ -191,18 +195,31 @@ class BoardsController < ApplicationController end end - def create - @board = @project.boards.build - @board.safe_attributes = params[:board] - - if @board.save - flash[:notice] = l(:notice_successful_create) - #Modified by young - #redirect_to_settings_in_projects - redirect_to project_board_url(@project, @board) - #Ended by young - else - render :action => 'new' + def create + if @project + @board = @project.boards.build + @board.safe_attributes = params[:board] + + if @board.save + flash[:notice] = l(:notice_successful_create) + #Modified by young + #redirect_to_settings_in_projects + redirect_to project_board_url(@project, @board) + #Ended by young + else + render :action => 'new' + end + elsif @course + parent = Board.find params[:board_id].to_i + board = @course.boards.build + board.name = params[:name] + board.description = board.name + board.project_id = -1 + board.position = parent.children.count + 1 + parent.children << board + respond_to do |format| + format.js + end end end @@ -223,8 +240,46 @@ class BoardsController < ApplicationController end def destroy + after_boards = @board.parent.children.where("position > #{@board.position}") + after_boards.update_all("position = position - 1") @board.destroy - redirect_to_settings_in_projects + if @course + respond_to do |format| + format.js + end + elsif @project + redirect_to_settings_in_projects + end + end + + def update_position + if @course + boards = @board.parent.children + if params[:opr] == 'up' && @board.position > 1 + before_board = boards.where("position = #{@board.position - 1}").first + if before_board && @board.update_attribute('position', @board.position - 1) + before_board.update_attribute('position', before_board.position + 1) + end + elsif params[:opr] == 'down' && @board.position < boards.count + after_board = boards.where("position = #{@board.position + 1}").first + if after_board && @board.update_attribute('position', @board.position + 1) + after_board.update_attribute('position', after_board.position - 1) + end + end + respond_to do |format| + format.js + end + end + end + + def update_name + if @course + @board.update_attribute("name", params[:name]) + @board.update_attribute("description", params[:name]) + respond_to do |format| + format.js + end + end end def join_to_org_subfields diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 226d24afa..7d13a6f85 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -122,7 +122,7 @@ class MessagesController < ApplicationController if @project redirect_to project_boards_path(@project) elsif @course - redirect_to course_boards_path(@course) + redirect_to course_boards_path(@course, :board_id => @board.id) end else redirect_to board_message_url(@board, @message) @@ -132,7 +132,7 @@ class MessagesController < ApplicationController if @project redirect_to project_boards_path(@project, :flag => true) elsif @course - redirect_to course_boards_path(@course, :flag => true) + redirect_to course_boards_path(@course, :board_id => @board.id, :flag => true) end else layout_file = @project ? 'base_projects' : 'base_courses' diff --git a/app/models/board.rb b/app/models/board.rb index b66719edf..d8b29f5cd 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -35,7 +35,7 @@ class Board < ActiveRecord::Base includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args)) } - safe_attributes 'name', 'description', 'parent_id', 'move_to' + safe_attributes 'name', 'description', 'parent_id', 'move_to', 'position' def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_messages, project) @@ -51,7 +51,11 @@ class Board < ActiveRecord::Base end def valid_parents - @valid_parents ||= project.boards - self_and_descendants + if project + @valid_parents ||= project.boards - self_and_descendants + elsif course + @valid_parents ||= course.boards - self_and_descendants + end end def reset_counters! diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 6759e33ce..55d4cca62 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -22,7 +22,7 @@
      - 班级讨论区 + <%= @board.parent_id.nil? ? "班级讨论区" : "#{@board.name}" %>
      diff --git a/app/views/boards/create.js.erb b/app/views/boards/create.js.erb new file mode 100644 index 000000000..8fe824e69 --- /dev/null +++ b/app/views/boards/create.js.erb @@ -0,0 +1,5 @@ +<% if @course %> + $("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); + <% course_board = @course.boards.where("parent_id is NULL").first %> + $("#board_children_list").html("<%= escape_javascript(render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/boards/destroy.js.erb b/app/views/boards/destroy.js.erb new file mode 100644 index 000000000..3c997b725 --- /dev/null +++ b/app/views/boards/destroy.js.erb @@ -0,0 +1,5 @@ +<% if @course %> +$("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); +<% course_board = @course.boards.where("parent_id is NULL").first %> +$("#board_children_list").html("<%= escape_javascript(render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/boards/update_name.js.erb b/app/views/boards/update_name.js.erb new file mode 100644 index 000000000..3c997b725 --- /dev/null +++ b/app/views/boards/update_name.js.erb @@ -0,0 +1,5 @@ +<% if @course %> +$("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); +<% course_board = @course.boards.where("parent_id is NULL").first %> +$("#board_children_list").html("<%= escape_javascript(render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/boards/update_position.js.erb b/app/views/boards/update_position.js.erb new file mode 100644 index 000000000..3c997b725 --- /dev/null +++ b/app/views/boards/update_position.js.erb @@ -0,0 +1,5 @@ +<% if @course %> +$("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); +<% course_board = @course.boards.where("parent_id is NULL").first %> +$("#board_children_list").html("<%= escape_javascript(render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index e5fcd8314..df04bd958 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -1,10 +1,22 @@ <% course_file_num = visable_attachemnts_incourse(@course).count%> <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> +<% course_board = @course.boards.where("parent_id is NULL").first %> +<% if show_nav?(course_board ? course_board.topics.count : 0) %>
    • 讨论区 <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
      • + <% unless course_board.children.empty? %> +
        + <% course_board.children.each do |board| %> +
      • + <% count = board ? (board.topics.count + Message.where("board_id =? and parent_id is not ?", board.id, nil).count) : 0 %> + <%=board.name %><%=count %> + <%= link_to( "",course_boards_path(@course, :board_id =>board.id, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> +
        • + <% end %> +
      + <% end %> <% end %> <% if show_nav?(@course.homework_commons.count) %>
    • diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index 4c54e2289..654e9ac73 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -22,6 +22,9 @@
    • 组织
      • +
    • + 讨论区设置 +
    @@ -131,6 +134,10 @@
    <%= render :partial => 'courses/settings/join_org' %>
    + +
    + <%= render :partial => 'courses/settings/boards_setting' %> +
    \ No newline at end of file diff --git a/app/views/layouts/_board_children_list.html.erb b/app/views/layouts/_board_children_list.html.erb new file mode 100644 index 000000000..9eb8938c5 --- /dev/null +++ b/app/views/layouts/_board_children_list.html.erb @@ -0,0 +1,11 @@ +<% unless course_board.children.empty? %> + +<% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index fe400bfbc..8832665e8 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -64,12 +64,16 @@ 动态<%=@course.course_activities.count %>
    • <% end %> - <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> + <% course_board = @course.boards.where("parent_id is NULL").first %> + <% unless show_nav?(course_board ? course_board.topics.count : 0) %>
  • - <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %> + <% count = course_board ? (course_board.topics.count + Message.where("board_id =? and parent_id is not ?", course_board.id, nil).count) : 0 %> 讨论区<%=count %> <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
    • +
    + <%= render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board} %> +
    <% end %> <% unless show_nav?(@course.homework_commons.count) %>
  • diff --git a/app/views/messages/_course_new.html.erb b/app/views/messages/_course_new.html.erb index bac064a9c..8c2be1588 100644 --- a/app/views/messages/_course_new.html.erb +++ b/app/views/messages/_course_new.html.erb @@ -4,11 +4,11 @@

    <%= l(:label_message_new) %>

      - <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> + <%= form_for @message, :url => {:action => 'new', :board_id => @board.id}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form_course', :locals => {:f => f,:is_new => true} %> <%= l(:button_submit)%> <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'blue_btn grey_btn fl c_white'} )%> - <%= link_to l(:button_cancel), course_boards_path(@course), :class => "grey_btn fl c_white ml10"%> + <%= link_to l(:button_cancel), course_boards_path(@course, :board_id => @board.id), :class => "grey_btn fl c_white ml10"%> <% end %>
    diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 99e3aca62..391128287 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -10,7 +10,7 @@ TO <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %> • - <%= link_to activity.course.name.to_s+" | 班级讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue mr5"%> + <%= link_to activity.course.name.to_s+" | #{activity.board.parent.nil? ? '班级讨论区' : activity.board.name}", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue mr5"%>
    -
    - <%= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %> +
    取消 + <%= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %>
    <% end %> \ No newline at end of file diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 528265c26..a278c585b 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -1,17 +1,16 @@ - - <% if @container_type == 0 %> -
    - <%= render :partial => 'project_file', locals: {project: @project} %> -
    - <% elsif @container_type == 1 %> -
    - <%= render :partial => 'course_file', locals: {course: @course} %> -
    - <% elsif @container_type == 2 %> -
    - <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %> -
    - <% end %> +<% if @container_type == 0 %> +
    + <%= render :partial => 'project_file', locals: {project: @project} %> +
    +<% elsif @container_type == 1 %> +
    + <%= render :partial => 'course_file', locals: {course: @course} %> +
    +<% elsif @container_type == 2 %> +
    + <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %> +
    +<% end %>
    - + - + />
    diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb index 921dfcb70..6b6279809 100644 --- a/app/views/poll/_edit_mulit.html.erb +++ b/app/views/poll/_edit_mulit.html.erb @@ -2,7 +2,7 @@
    - + - +
    • <% end %>
  • - <%= 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 == project.id && file.container_type == "Project" && file.destroyable %> + <%= link_to( '删除资源', attachment_path(file),:data => {:confirm => file.destroyable ? l(:text_are_you_sure) : l(:text_history_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project" %>
    • <% end %> diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index cfe52e11a..985fd9bc3 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -188,6 +188,7 @@ zh: text_are_you_sure: 您确定要删除吗？ #js 提示 + text_history_are_you_sure: 本资源有多个版本，你确定要全部删除吗？ text_are_you_sure_out: 你确定要退出该班级吗？ text_are_you_sure_out_group: 你确定要退出该分班吗？ text_are_you_sure_all: 您确定要删除所有文件吗 From f87e335acf4f188da396bda1416745c5b45b0f59 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 15:01:36 +0800 Subject: [PATCH 12/41] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?= =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index c9bb42ebe..de232a423 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -332,7 +332,7 @@ class WordsController < ApplicationController @homework_common = HomeworkCommon.find reply.jour_id if params[:reply_message].size>0 && User.current.logged? && @user options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id} - feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options) + feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, reply.root_id, options) if (feedback.errors.empty?) if params[:asset_id] ids = params[:asset_id].split(',') @@ -366,7 +366,7 @@ class WordsController < ApplicationController @syllabus = Syllabus.find reply.jour_id if params[:reply_message].size>0 && User.current.logged? && @user options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i, :root_id => reply.root_id} - feedback = Syllabus.add_syllabus_jour(@user, params[:reply_message], reply.jour_id, options) + feedback = Syllabus.add_syllabus_jour(@user, params[:reply_message], reply.jour_id, reply.root_id, options) if (feedback.errors.empty?) if params[:asset_id] ids = params[:asset_id].split(',') From 0c137515c1e0512d9f578dcf6c8e9d81bfd39a23 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 15:08:29 +0800 Subject: [PATCH 13/41] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=AD=98=E5=9C=A8=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_org_subfield_list.html.erb | 2 +- app/views/files/_resource_detail.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb index 45aa7095b..05d307016 100644 --- a/app/views/files/_org_subfield_list.html.erb +++ b/app/views/files/_org_subfield_list.html.erb @@ -80,7 +80,7 @@ <% end %>
  • <%= 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 %> + :data => {:confirm => file.destroyable ? l(:text_are_you_sure) : l(:text_history_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" %>
    • <%else%> diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb index 08b85ab2f..c9431f7d3 100644 --- a/app/views/files/_resource_detail.html.erb +++ b/app/views/files/_resource_detail.html.erb @@ -82,8 +82,8 @@ <%end%>
  • <%= 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 == @course.id && file.container_type == "Course" && file.destroyable %> + :data => {:confirm => file.destroyable ? l(:text_are_you_sure) : l(:text_history_are_you_sure)}, + :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" %>
    • <% end %> From 5f04baf572c7577acbef27b597d2dff29d9d3738 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 15:09:47 +0800 Subject: [PATCH 14/41] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=98=BE=E7=A4=BA=EF=BC=9A=E2=80=9C=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D=E3=80=81=E2=80=9C=E6=94=B6?= =?UTF-8?q?=E8=B5=B7=E5=9B=9E=E5=A4=8D=E2=80=9D=E7=82=B9=E5=87=BB=E6=97=A0?= =?UTF-8?q?=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 150a113a3..de7ba7f68 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3559,7 +3559,7 @@ class UsersController < ApplicationController @type = 'Issue' @user_activity_id = params[:div_id].to_i if params[:div_id] when 'BlogComment' - #obj = BlogComment.where('id = ?', params[:id].to_i).first + obj = BlogComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] @homepage = params[:homepage].to_i @type = 'BlogComment' From e72b2de6e248418abeaa867ced757bedb0727fbf Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 14 Oct 2016 15:29:07 +0800 Subject: [PATCH 15/41] =?UTF-8?q?=E9=95=BF=E5=8D=95=E8=AF=8D=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E6=8A=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_show_MCQ_result.html.erb | 2 +- app/views/poll/_show_MC_result.html.erb | 2 +- app/views/poll/_show_mulit_result.html.erb | 2 +- app/views/poll/_show_single_result.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_show_MCQ_result.html.erb b/app/views/poll/_show_MCQ_result.html.erb index 065a4b6c9..4129f164b 100644 --- a/app/views/poll/_show_MCQ_result.html.erb +++ b/app/views/poll/_show_MCQ_result.html.erb @@ -13,7 +13,7 @@ <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%> -

    +

    <%= answer.poll_answer.answer_text == "" ? (answer.vote_text.nil? ? "其他" : answer.vote_text) : answer.poll_answer.answer_text %>

    diff --git a/app/views/poll/_show_MC_result.html.erb b/app/views/poll/_show_MC_result.html.erb index 34bd7f644..d154468b3 100644 --- a/app/views/poll/_show_MC_result.html.erb +++ b/app/views/poll/_show_MC_result.html.erb @@ -13,7 +13,7 @@ <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%> -

    +

    <%= answer.poll_answer.answer_text == "" ? (answer.vote_text.nil? ? "其他" : answer.vote_text) : answer.poll_answer.answer_text %>

    diff --git a/app/views/poll/_show_mulit_result.html.erb b/app/views/poll/_show_mulit_result.html.erb index 77c6d510c..da72ea35d 100644 --- a/app/views/poll/_show_mulit_result.html.erb +++ b/app/views/poll/_show_mulit_result.html.erb @@ -10,7 +10,7 @@ <% poll_question.poll_answers.reorder("answer_position").each_with_index do |poll_answer, i| %>

    <%= i + 1 %>.<%= poll_answer.answer_text%>

    -

    +

    <%= get_anwser_vote_text(poll_question.id,User.current.id,poll_answer.id).html_safe%>

    diff --git a/app/views/poll/_show_single_result.html.erb b/app/views/poll/_show_single_result.html.erb index 7bdf9940a..4fbf3698f 100644 --- a/app/views/poll/_show_single_result.html.erb +++ b/app/views/poll/_show_single_result.html.erb @@ -8,7 +8,7 @@
    -

    +

    <%= get_anwser_vote_text poll_question.id,User.current.id%>

    From 6b7ca9c84d1ee18b382c720d0acb73c30a432e0e Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 15:30:44 +0800 Subject: [PATCH 16/41] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=EF=BC=9A=E7=BC=96=E8=BE=91=EF=BC=88=E7=AC=94=EF=BC=89=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=8C=89=E9=92=AE=E5=BB=BA=E8=AE=AE=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=BD=93=E9=BC=A0=E6=A0=87=E7=A7=BB=E4=B8=8A=E5=8E=BB=E6=97=B6?= =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA=E3=80=81=E5=A4=9A=E9=80=89=E9=A2=98?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll_form.html.erb | 2 +- app/views/poll/_show_head.html.erb | 4 ++-- app/views/poll/show.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index 9e087d329..6edea0362 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -577,7 +577,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb index 8db327146..83b5d26e9 100644 --- a/app/views/poll/_show_head.html.erb +++ b/app/views/poll/_show_head.html.erb @@ -1,5 +1,5 @@ -
    - +
    +

    <%= poll.polls_name%>

    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
    diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb index 484b9e66b..63f7feae5 100644 --- a/app/views/poll/show.html.erb +++ b/app/views/poll/show.html.erb @@ -233,7 +233,7 @@
    <% end %>
    -
    "> +
    ">

    多行主观题

    <% multi_question_list.each do |pq| %>
    From eff68d937f2cf5bc4eafb2d89d50001078a19a17 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 15:45:13 +0800 Subject: [PATCH 17/41] gemfile --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 1305320cf..cbeade2a3 100644 --- a/Gemfile +++ b/Gemfile @@ -50,10 +50,10 @@ gem 'elasticsearch-model' gem 'elasticsearch-rails' #rails 3.2.22.2 bug - # gem "test-unit", "~>3.0" + gem "test-unit", "~>3.0" ### profile - # gem 'oneapm_rpm' + gem 'oneapm_rpm' group :development do gem 'grape-swagger' From 0859f86518cb4e277130a850bbae0dac797104fa Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 14 Oct 2016 15:46:15 +0800 Subject: [PATCH 18/41] =?UTF-8?q?=E7=A9=BA=E9=97=AE=E5=8D=B7=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_show_head.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb index 8db327146..e0fe4415d 100644 --- a/app/views/poll/_show_head.html.erb +++ b/app/views/poll/_show_head.html.erb @@ -1,5 +1,5 @@
    - +

    <%= poll.polls_name%>

    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
    From 45008d98684c8f5bb0874cdf5d34c3bc7ae837b0 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 15:55:47 +0800 Subject: [PATCH 19/41] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=EF=BC=9A=E9=BC=A0=E6=A0=87=E7=82=B9=E5=87=BB=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=A1=86=EF=BC=8C=E5=85=89=E6=A0=87=E5=8D=B4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=88=B0=E7=AC=AC=E4=BA=8C=E8=A1=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_edit_head.html.erb | 4 +--- public/stylesheets/css/courses.css | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb index 8238b9f37..90a12f20d 100644 --- a/app/views/poll/_edit_head.html.erb +++ b/app/views/poll/_edit_head.html.erb @@ -3,9 +3,7 @@
    - + 取消 保存
    diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 5977f25de..178b772eb 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -482,7 +482,7 @@ a:hover.btn_cancel{ color:#666;} .testStatus{width:698px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px; background:#ffffff; position:relative; color:#767676;} .testEdit{ background:url(../images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; bottom:10px; right:10px; position:absolute;} a:hover.testEdit{ background:url(../images/icons.png) -21px -272px no-repeat;} -.testDesEdit {width:670px; overflow:hidden;} +.testDesEdit {width:670px; overflow:hidden; white-space:pre-wrap;} .testEditTitle{ padding:10px 0px ; float:left; width:564px; } .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;} .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;} From caa54c77a23847b1ab398bb0c05f00b3b61905a2 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 16:00:40 +0800 Subject: [PATCH 20/41] =?UTF-8?q?=E8=A7=A3=E5=86=B3issue=E7=9A=84=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 122 +++++++++++++++++++++++++++++++- 1 file changed, 120 insertions(+), 2 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 6d5f25c3b..cf4e2bf34 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,3 +1,121 @@ +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: true,init_activity: true) %> +<% end %> + + +
    @@ -9,7 +127,7 @@
  • 关闭<%#= @issues_filter_author_count %><%= @issue_close_count %>
    • - + " id="sendexcel" class="hw_btn_blue fr" alt="导出EXCEL" onclick="remote_function_export('<%= @project.id %>')">导出EXCEL
    <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> @@ -168,4 +286,4 @@
    -
    \ No newline at end of file +
    From 38d43cfb674c0a9687e0dc3c9ad9806d5e36bbb9 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 14 Oct 2016 16:11:46 +0800 Subject: [PATCH 21/41] =?UTF-8?q?=E5=BF=85=E7=AD=94=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_new_MC.html.erb | 2 +- app/views/poll/_new_MCQ.html.erb | 2 +- app/views/poll/_new_mulit.html.erb | 2 +- app/views/poll/_new_single.html.erb | 2 +- public/stylesheets/css/common.css | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb index b3f38df21..108fb9f5a 100644 --- a/app/views/poll/_new_MC.html.erb +++ b/app/views/poll/_new_MC.html.erb @@ -5,7 +5,7 @@
    - +
    diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index 4405ce581..472ddfaf1 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -3,7 +3,7 @@
    - +
    diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb index 056da12a7..5f58afffa 100644 --- a/app/views/poll/_new_mulit.html.erb +++ b/app/views/poll/_new_mulit.html.erb @@ -3,7 +3,7 @@
    - +