增加项目的显示
This commit is contained in:
parent
e1a88dedbb
commit
56613b6358
|
@ -100,4 +100,13 @@ class OrganizationsController < ApplicationController
|
||||||
def members
|
def members
|
||||||
@members = OrgMember.where("organization_id =?", @organization.id)
|
@members = OrgMember.where("organization_id =?", @organization.id)
|
||||||
end
|
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
|
end
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
<% projects.each do |project|%>
|
||||||
|
<% pro = Project.find project.project_id %>
|
||||||
|
<li class="homepageLeftMenuCoursesLine">
|
||||||
|
<%= link_to pro.name, project_path(pro.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => pro.name%>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
<% if projects.size == 5%>
|
||||||
|
<li class="homepageLeftMenuMore" id="show_more_org_project">
|
||||||
|
<input type="hidden" value="<%= page%>" id="org_project_page_num">
|
||||||
|
<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%= more_org_projects_organization_path(org_id)%>');"></a>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
|
@ -76,17 +76,18 @@
|
||||||
<div class="homepageLeftMenuBlock">
|
<div class="homepageLeftMenuBlock">
|
||||||
<%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
|
<%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
|
||||||
</div>
|
</div>
|
||||||
<!--<div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">项目</a><a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a></div>-->
|
<div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">项目</a>
|
||||||
<!--<div class="homepageLeftMenuCourses borderBottomNone">-->
|
<!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
|
||||||
<!--<ul style="display:none;">-->
|
</div>
|
||||||
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称一</a></li>-->
|
<div class="homepageLeftMenuCourses borderBottomNone">
|
||||||
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称二</a></li>-->
|
<ul >
|
||||||
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称三</a></li>-->
|
<%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.org_projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
|
||||||
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称四</a></li>-->
|
<!--<%#= @organization.org_projects.each do |p|%>-->
|
||||||
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称五</a></li>-->
|
<!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
|
||||||
|
<!--<%# end %>-->
|
||||||
<!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
|
<!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
|
||||||
<!--</ul>-->
|
</ul>
|
||||||
<!--</div>-->
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="homepageRight">
|
<div class="homepageRight">
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
$("#show_more_org_project").replaceWith("<%= escape_javascript( render :partial => 'layouts/org_projects',:locals => {:projects => @org_projects,:org_id => @organization, :page => @page} )%>");
|
|
@ -37,6 +37,7 @@ RedmineApp::Application.routes.draw do
|
||||||
get 'clear_org_avatar_temp'
|
get 'clear_org_avatar_temp'
|
||||||
put 'set_homepage'
|
put 'set_homepage'
|
||||||
get 'members'
|
get 'members'
|
||||||
|
get 'more_org_projects'
|
||||||
end
|
end
|
||||||
collection do
|
collection do
|
||||||
get 'check_uniq'
|
get 'check_uniq'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
//添加组织成员的提交函数
|
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֯<EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD>ύ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
function submit_add_org_members(){
|
function submit_add_org_members(){
|
||||||
$("#org_member_add_form").submit();
|
$("#org_member_add_form").submit();
|
||||||
}
|
}
|
||||||
|
@ -32,3 +32,14 @@ function observeSearchfield(fieldId, targetId, url) {
|
||||||
$this.bind('keyup click mousemove', reset);
|
$this.bind('keyup click mousemove', reset);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//显示更多的项目
|
||||||
|
function show_more_org_project(url){
|
||||||
|
$.get(
|
||||||
|
url,
|
||||||
|
{ page: $("#org_project_page_num").val() },
|
||||||
|
function (data) {
|
||||||
|
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
Loading…
Reference in New Issue