jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

This commit is contained in:
cxt 2015-12-30 17:28:34 +08:00
parent 6b8da96205 aa951cd7b9
commit 1448c4f90e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/student_work/show.js.erb
View File

@ -25,7 +25,7 @@ else{
indentUnit: 2, indentUnit: 2,
matchBrackets: true, matchBrackets: true,
readOnly: true, readOnly: true,
value: document.getElementById("work-src").innerText value: $("#work-src").text()
} }
); );

3
config/routes.rb
View File

@ -62,6 +62,9 @@ RedmineApp::Application.routes.draw do
end end
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 resources :org_member do
member do member do