Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vidjil
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1,711
Issues
1,711
List
Boards
Labels
Service Desk
Milestones
Merge Requests
86
Merge Requests
86
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vidjil
vidjil
Commits
20688661
Commit
20688661
authored
Oct 20, 2020
by
Ryan Herbert
Committed by
Mathieu Giraud
Nov 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add server identifier in conf.js
See
#2927
parent
d084f99f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
0 deletions
+7
-0
browser/index.html
browser/index.html
+1
-0
browser/js/model_loader.js
browser/js/model_loader.js
+3
-0
doc/server.md
doc/server.md
+2
-0
docker/vidjil-client/conf/conf.js
docker/vidjil-client/conf/conf.js
+1
-0
No files found.
browser/index.html
View file @
20688661
...
...
@@ -307,6 +307,7 @@
<div
id=
"menu_right_part"
>
<div
id=
"server-id"
class=
"menu"
></div>
<div
id=
"fps"
style=
"display: none"
>
</div>
<div
id=
"header_messages"
class=
"message_container header"
></div>
...
...
browser/js/model_loader.js
View file @
20688661
...
...
@@ -45,6 +45,9 @@ Model_loader.prototype = {
if
(
typeof
config
!=
'
undefined
'
&&
typeof
config
.
autoload_analysis
!=
'
undefined
'
)
params
.
analysis
=
config
.
autoload_analysis
if
(
typeof
config
!=
'
undefined
'
&&
typeof
config
.
server_id
!=
'
undefined
'
)
document
.
getElementById
(
'
server-id
'
).
innerText
=
config
.
server_id
/** load the default vidjil file, open the database or display the welcome popup depending on the case*/
if
(
typeof
params
.
data
!==
"
undefined
"
)
{
if
(
typeof
params
.
analysis
!==
"
undefined
"
){
...
...
doc/server.md
View file @
20688661
...
...
@@ -731,6 +731,8 @@ Now we need to configure the database connection parameters:
```
This tells the browser to access the server on the current domain.
You may also add a variable called
`server_id`
in order to name different
instances and environments; it will be displayed in the top menu.
-
copy vidjil/server/web2py/applications/vidjil/modules/defs.py.sample
to vidjil/server/web2py/applications/vidjil/modules/defs.py
...
...
docker/vidjil-client/conf/conf.js
View file @
20688661
...
...
@@ -16,6 +16,7 @@ var config = {
*/
/* 1) Patient database */
"
server_id
"
:
""
,
"
use_database
"
:
true
,
"
db_address
"
:
"
https://localhost/vidjil/
"
,
// Public test server
"
login
"
:
""
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment