From 56613b6358aae1d3432802917301f47745a5d4da Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 14 Nov 2015 10:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 9 ++++++++ app/views/layouts/_org_projects.html.erb | 12 +++++++++++ app/views/layouts/base_org.html.erb | 21 ++++++++++--------- .../organizations/more_org_projects.js.erb | 1 + config/routes.rb | 1 + public/javascripts/org.js | 13 +++++++++++- 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 app/views/layouts/_org_projects.html.erb create mode 100644 app/views/organizations/more_org_projects.js.erb diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 5f823ee3d..fdd12030f 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -100,4 +100,13 @@ class OrganizationsController < ApplicationController def members @members = OrgMember.where("organization_id =?", @organization.id) end + + def more_org_projects + @organization = Organization.find params[:id] + @page = params[:page] + @org_projects = @organization.org_projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5) + respond_to do |format| + format.js + end + end end diff --git a/app/views/layouts/_org_projects.html.erb b/app/views/layouts/_org_projects.html.erb new file mode 100644 index 000000000..be65fd516 --- /dev/null +++ b/app/views/layouts/_org_projects.html.erb @@ -0,0 +1,12 @@ +<% projects.each do |project|%> + <% pro = Project.find project.project_id %> +
  • + <%= link_to pro.name, project_path(pro.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => pro.name%> +
    • +<% end %> +<% if projects.size == 5%> +
  • + + +
    • +<% end%> \ No newline at end of file diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 32ada4729..2096f08f1 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -76,17 +76,18 @@
    <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
    - - - - - - - - +
    项目 + +
    +
    + +
    diff --git a/app/views/organizations/more_org_projects.js.erb b/app/views/organizations/more_org_projects.js.erb new file mode 100644 index 000000000..029661d39 --- /dev/null +++ b/app/views/organizations/more_org_projects.js.erb @@ -0,0 +1 @@ +$("#show_more_org_project").replaceWith("<%= escape_javascript( render :partial => 'layouts/org_projects',:locals => {:projects => @org_projects,:org_id => @organization, :page => @page} )%>"); diff --git a/config/routes.rb b/config/routes.rb index 5cb42fd58..0f05c3521 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -37,6 +37,7 @@ RedmineApp::Application.routes.draw do get 'clear_org_avatar_temp' put 'set_homepage' get 'members' + get 'more_org_projects' end collection do get 'check_uniq' diff --git a/public/javascripts/org.js b/public/javascripts/org.js index f74277a9e..e26995931 100644 --- a/public/javascripts/org.js +++ b/public/javascripts/org.js @@ -1,4 +1,4 @@ -//֯Աύ +//�����֯��Ա���ύ���� function submit_add_org_members(){ $("#org_member_add_form").submit(); } @@ -31,4 +31,15 @@ function observeSearchfield(fieldId, targetId, url) { var timer = setInterval(check, 300); $this.bind('keyup click mousemove', reset); }); +} + +//显示更多的项目 +function show_more_org_project(url){ + $.get( + url, + { page: $("#org_project_page_num").val() }, + function (data) { + + } + ); } \ No newline at end of file