diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb index 87ee4e8d8..9055b9a1b 100644 --- a/app/views/layouts/_base_development_group.html.erb +++ b/app/views/layouts/_base_development_group.html.erb @@ -1,5 +1,4 @@ <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> -
\ No newline at end of file + \ No newline at end of file diff --git a/app/views/layouts/_base_friend_group.html.erb b/app/views/layouts/_base_friend_group.html.erb index c367882e5..71d375501 100644 --- a/app/views/layouts/_base_friend_group.html.erb +++ b/app/views/layouts/_base_friend_group.html.erb @@ -1,5 +1,4 @@ <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> -
- <% end %> -
\ No newline at end of file + <% end %> \ No newline at end of file diff --git a/app/views/layouts/_base_research_team.html.erb b/app/views/layouts/_base_research_team.html.erb index 811a58961..3f942bc40 100644 --- a/app/views/layouts/_base_research_team.html.erb +++ b/app/views/layouts/_base_research_team.html.erb @@ -1,5 +1,4 @@ <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> -
- <% end%> -
\ No newline at end of file + <% 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 15e30bfbb..865cf303b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -43,19 +43,19 @@ if(data == 1) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team)))%>"); - $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_development_group')) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_development_group')) %>'); $("#close_light").attr("onClick","close_window('development_group');"); } else if(data == 2) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group)))%>"); - $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_research_team')) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_research_team')) %>'); $("#close_light").attr("onClick","close_window('research_group');"); } else if(data == 3) { $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization)))%>"); - $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_friend_group')) %>'); + $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_friend_group')) %>'); $("#close_light").attr("onClick","close_window('friend_organization');"); } else @@ -165,13 +165,15 @@ <% end %> - <% if @project.project_new_type == 1 || @project.project_new_type.nil? %> +
+ <% if @project.project_new_type == 1 || @project.project_new_type.nil? %> <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%> <% elsif @project.project_new_type == 2 %> <%= render :partial => 'layouts/base_research_team', :locals => {:project => @project}%> - <% else %> + <% else %> <%= render :partial => 'layouts/base_friend_group', :locals => {:project => @project}%> <% end %> +