From 887d2f9f00f554c09c1f24a579a2da638e9fff41 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 30 Dec 2015 13:14:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0micros=E5=92=8Cnubot?= =?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index d82a9de8a..9fb56a2d4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -62,6 +62,9 @@ RedmineApp::Application.routes.draw do end end + get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'} + get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'} + resources :org_member do member do From 941d6d09d57cf37ca59d059bd9ab5353771b8c43 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 30 Dec 2015 13:18:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9C=A8firefox=E4=B8=AD=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=BA=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/show.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb index 1a133a5d3..477f06e0f 100644 --- a/app/views/student_work/show.js.erb +++ b/app/views/student_work/show.js.erb @@ -25,7 +25,7 @@ else{ indentUnit: 2, matchBrackets: true, readOnly: true, - value: document.getElementById("work-src").innerText + value: $("#work-src").text() } );