diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index b3827d5f0..e249a0f37 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,56 +1,56 @@ -<% projects.each do |project|%> -
  • - <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %> - <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => (project.is_public? ? "公开项目:":"私有项目:") + project.name%> - -
  • -<% end %> -<% if projects.size == 5%> -
  • - - -
  • +<% projects.each do |project|%> +
  • + <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project' and shield_id=#{project.id}").count %> + <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目:":"私有项目:") + project.name%> + +
  • +<% end %> +<% if projects.size == 5%> +
  • + + +
  • <% end%> \ No newline at end of file diff --git a/app/views/projects/set_public_or_private.js.erb b/app/views/projects/set_public_or_private.js.erb index e164e1c0d..dbca3f65c 100644 --- a/app/views/projects/set_public_or_private.js.erb +++ b/app/views/projects/set_public_or_private.js.erb @@ -1,5 +1,7 @@ -<% if @project.is_public? %> - $("#set_project_public_<%= @project.id %>").text("设为私有"); -<% else %> - $("#set_project_public_<%= @project.id %>").text("设为公开"); +<% if @project.is_public? %> + $("#set_project_public_<%= @project.id %>").text("设为私有"); + $("#show_project_<%= @project.id %>").attr("title","公开项目:<%= @project.name %>"); +<% else %> + $("#set_project_public_<%= @project.id %>").text("设为公开"); + $("#show_project_<%= @project.id %>").attr("title","私有项目:<%= @project.name %>"); <% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 25dfa042e..08163a395 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,10 +74,10 @@ RedmineApp::Application.routes.draw do end Organization.where("domain is not null").each do |org| - org_domains = [] - org_domains << org.domain - #get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain} - get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: lambda{ |request| org_domains.include?(request.remote_ip) } + # org_domains = [] + # org_domains << org.domain + get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: {subdomain: org.domain} + #get '/', to: 'organizations#show', defaults: { id: org.id }, constraints: lambda{ |request| org_domains.include?(request.remote_ip) } end get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'} get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}