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/10] =?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/10] =?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/10] =?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 db63a5514dfdc608940a78d8a025bb118c992dbc Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 13:45:47 +0800 Subject: [PATCH 04/10] =?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 4646f20bbad82f1a84304424778872f59d6ccf35 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Oct 2016 14:28:51 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 1 - app/helpers/application_helper.rb | 15 +++++++++++ .../files/_attachment_history_popub.html.erb | 9 ++++--- app/views/files/index.html.erb | 27 +++++++++---------- app/views/layouts/base_courses.html.erb | 2 +- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 752ff985f..821f75de1 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -644,7 +644,6 @@ 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/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6474a0eae..b3c45e726 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1380,6 +1380,21 @@ module ApplicationHelper end end + # 判断课程、项目、组织是否有权限删除历史资源 + # 项目管理员或者附件的作者可以删除 + # (is_project_manager?(User.current.id, @project.id) || User.current.id == history.author_id) + def allow_to_delete_attachment history + attachment = history.attachment + case attachment.try(:container_type) + when "Project" + result = is_project_manager?(User.current.id, attachment.container_id) || User.current.id == history.author_id + when "Course" + result = User.current.allowed_to?(:as_teacher, attachment.container) || User.current.id == history.author_id + when "Organization" + # result = || User.current.id == history.author_id + end + end + # Wiki links # # Examples: diff --git a/app/views/files/_attachment_history_popub.html.erb b/app/views/files/_attachment_history_popub.html.erb index 871264f5a..869608434 100644 --- a/app/views/files/_attachment_history_popub.html.erb +++ b/app/views/files/_attachment_history_popub.html.erb @@ -28,8 +28,9 @@ <%= 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) %> + :method => :delete, + :class => "postOptionLink", + :class => "btn") if allow_to_delete_attachment(history) %> <% end %> @@ -50,8 +51,8 @@
    -
    - <%= 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 %> +
    @@ -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 +