From 3697d74d48cd127dcb87095e3ee636cb973502d5 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 14 Jan 2016 18:13:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=90=E5=9F=9F=E5=90=8D=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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'} From 1c62edbed4a7178470ef1b168cbc73c0b89b3ab7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 14 Jan 2016 18:26:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=BE=E4=B8=BA?= =?UTF-8?q?=E7=A7=81=E6=9C=89title=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_projects.html.erb | 2 +- app/views/projects/set_public_or_private.js.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index b103118ba..e249a0f37 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,7 +1,7 @@ <% 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%> + <%= 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%>
      • diff --git a/app/views/projects/set_public_or_private.js.erb b/app/views/projects/set_public_or_private.js.erb index ca6c63f0b..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("设为私有"); + $("#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