diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8e9802280..c846de965 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -323,6 +323,7 @@ class ProjectsController < ApplicationController @member ||= @project.members.new @trackers = Tracker.sorted.all @wiki ||= @project.wiki + @select_tab = params[:tab] end def send_mail_to_member diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f9070c417..e38692ade 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1409,6 +1409,16 @@ module ApplicationHelper link_to l(:button_delete), url, options end + def delete_link_version(url, options={}) + options = { + :method => :delete, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'c_purple' + }.merge(options) + + link_to l(:button_delete), url, options + end + def delete_new_link(url, options={}) 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 %> -
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> @@ -50,5 +49,4 @@ -
\ 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 %> -
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> @@ -27,5 +26,4 @@ <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> <% end %>
- <% 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 %> -
<%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> @@ -38,5 +37,4 @@ <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> <% end %>
- <% 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 36dbef692..cc4d9ff06 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 %> +
diff --git a/app/views/projects/modules.js.erb b/app/views/projects/modules.js.erb new file mode 100644 index 000000000..9ef3a1e2d --- /dev/null +++ b/app/views/projects/modules.js.erb @@ -0,0 +1,10 @@ +$('#pro_st_tbc_02').html('<%= escape_javascript(render :partial => 'projects/settings/new_modules') %>'); + + +<% if @project.project_new_type == 1 || @project.project_new_type.nil? %> + $('#project_memu_list').html('<%= escape_javascript(render :partial => 'layouts/base_development_group', :locals => {:project => @project}) %>'); +<% elsif @project.project_new_type == 2 %> + $('#project_memu_list').html('<%= escape_javascript(render :partial => 'layouts/base_research_team', :locals => {:project => @project}) %>'); +<% else %> + $('#project_memu_list').html('<%= escape_javascript(render :partial => 'layouts/base_friend_group', :locals => {:project => @project}) %>'); +<% end %> \ No newline at end of file diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 3e66fec5e..247656350 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -1,3 +1,13 @@ + +

配置

diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb index c6aa26348..d80d27a98 100644 --- a/app/views/projects/settings/_new_modules.html.erb +++ b/app/views/projects/settings/_new_modules.html.erb @@ -5,18 +5,18 @@ <% Redmine::AccessControl.available_project_modules.each do |m| %>
    • <% end %>

    - <%= check_all_links 'modules-form' %> + <%= check_all_links('modules-form').html_safe %>

    - + <%= l(:button_save) %>

    diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 06e704495..b05575049 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -28,7 +28,7 @@ <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:button_edit), edit_version_path(version), :class => 'c_purple' %> - <%= delete_link version_path(version) %> + <%= delete_link_version version_path(version) %> <% end %> diff --git a/db/schema.rb b/db/schema.rb index f9ade5aa4..69a07f2ef 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150409092151) do +ActiveRecord::Schema.define(:version => 20150414115406) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false