Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos.toolbox
Commits
f27ccedc
Commit
f27ccedc
authored
Feb 12, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: commit for deleting whitespaces
parent
bc28417f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
slapos/runner/runnertest.py
slapos/runner/runnertest.py
+1
-1
slapos/runner/static/css/styles.css
slapos/runner/static/css/styles.css
+2
-2
slapos/runner/static/js/scripts/login.js
slapos/runner/static/js/scripts/login.js
+1
-1
slapos/runner/static/js/scripts/softwareFolder.js
slapos/runner/static/js/scripts/softwareFolder.js
+2
-2
slapos/runner/static/js/scripts/viewlog.js
slapos/runner/static/js/scripts/viewlog.js
+1
-1
slapos/runner/views.py
slapos/runner/views.py
+5
-5
No files found.
slapos/runner/runnertest.py
View file @
f27ccedc
...
@@ -106,7 +106,7 @@ class SlaprunnerTestCase(unittest.TestCase):
...
@@ -106,7 +106,7 @@ class SlaprunnerTestCase(unittest.TestCase):
rpwd
.
write
(
self
.
rcode
)
rpwd
.
write
(
self
.
rcode
)
#Create config.json
#Create config.json
json_file
=
os
.
path
.
join
(
views
.
app
.
config
[
'etc_dir'
],
'config.json'
)
json_file
=
os
.
path
.
join
(
views
.
app
.
config
[
'etc_dir'
],
'config.json'
)
if
not
os
.
path
.
exists
(
json_file
):
if
not
os
.
path
.
exists
(
json_file
):
params
=
{
params
=
{
'run_instance'
:
True
,
'run_instance'
:
True
,
'run_software'
:
True
,
'run_software'
:
True
,
...
...
slapos/runner/static/css/styles.css
View file @
f27ccedc
...
@@ -816,7 +816,7 @@ padding:10px; font-size:14px; color:#03406A}
...
@@ -816,7 +816,7 @@ padding:10px; font-size:14px; color:#03406A}
max-width
:
350px
;
max-width
:
350px
;
}
}
.fullScreen
.fullScreen-editor
{
.fullScreen
.fullScreen-editor
{
height
:
auto
!important
;
height
:
auto
!important
;
width
:
auto
!important
;
width
:
auto
!important
;
border
:
0
;
border
:
0
;
...
@@ -831,7 +831,7 @@ padding:10px; font-size:14px; color:#03406A}
...
@@ -831,7 +831,7 @@ padding:10px; font-size:14px; color:#03406A}
.fullScreen
{
.fullScreen
{
overflow
:
hidden
;
overflow
:
hidden
;
}
}
/* ******************* */
/* ******************* */
#shellinabox
{
width
:
100%
;
min-height
:
530px
;}
#shellinabox
{
width
:
100%
;
min-height
:
530px
;}
slapos/runner/static/js/scripts/login.js
View file @
f27ccedc
...
@@ -27,7 +27,7 @@ $(document).ready(function () {
...
@@ -27,7 +27,7 @@ $(document).ready(function () {
$
(
"
#login
"
).
removeClass
(
"
button
"
).
addClass
(
"
dsblebutton
"
);
$
(
"
#login
"
).
removeClass
(
"
button
"
).
addClass
(
"
dsblebutton
"
);
$
.
post
(
url
,
param
,
function
(
data
)
{
$
.
post
(
url
,
param
,
function
(
data
)
{
if
(
data
.
code
===
1
)
{
if
(
data
.
code
===
1
)
{
url
=
'
https://
'
+
param
.
clogin
+
'
:
'
+
param
.
cpwd
+
'
@
'
url
=
'
https://
'
+
param
.
clogin
+
'
:
'
+
param
.
cpwd
+
'
@
'
+
location
.
host
+
$SCRIPT_ROOT
+
'
/
'
;
+
location
.
host
+
$SCRIPT_ROOT
+
'
/
'
;
window
.
location
.
href
=
url
;
window
.
location
.
href
=
url
;
}
else
{
}
else
{
...
...
slapos/runner/static/js/scripts/softwareFolder.js
View file @
f27ccedc
...
@@ -727,9 +727,9 @@ $(document).ready(function () {
...
@@ -727,9 +727,9 @@ $(document).ready(function () {
return
false
;
return
false
;
});
});
$
(
"
#fullscreen
"
).
click
(
function
(){
$
(
"
#fullscreen
"
).
click
(
function
(){
$
(
"
body
"
).
toggleClass
(
"
fullScreen
"
);
$
(
"
body
"
).
toggleClass
(
"
fullScreen
"
);
$
(
"
#editor
"
).
toggleClass
(
"
fullScreen-editor
"
);
$
(
"
#editor
"
).
toggleClass
(
"
fullScreen-editor
"
);
editor
.
resize
();
editor
.
resize
();
});
});
...
...
slapos/runner/static/js/scripts/viewlog.js
View file @
f27ccedc
...
@@ -14,7 +14,7 @@ $(document).ready(function () {
...
@@ -14,7 +14,7 @@ $(document).ready(function () {
if
(
pair
[
0
]
==
variable
)
{
if
(
pair
[
0
]
==
variable
)
{
return
pair
[
1
];
return
pair
[
1
];
}
}
}
}
}
}
// Current_log is not used for auto displaying mode, only for manual reload of log file!!!
// Current_log is not used for auto displaying mode, only for manual reload of log file!!!
...
...
slapos/runner/views.py
View file @
f27ccedc
...
@@ -541,11 +541,11 @@ def updateBuildAndRunConfig():
...
@@ -541,11 +541,11 @@ def updateBuildAndRunConfig():
run_software
=
(
True
if
request
.
form
[
'run_software'
]
==
"true"
else
False
)
run_software
=
(
True
if
request
.
form
[
'run_software'
]
==
"true"
else
False
)
if
code
:
if
code
:
params
=
{}
params
=
{}
params
[
'run_instance'
]
=
run_instance
params
[
'run_instance'
]
=
run_instance
params
[
'run_software'
]
=
run_software
params
[
'run_software'
]
=
run_software
params
[
'max_run_instance'
]
=
max_run_instance
params
[
'max_run_instance'
]
=
max_run_instance
params
[
'max_run_software'
]
=
max_run_software
params
[
'max_run_software'
]
=
max_run_software
saveBuildAndRunParams
(
app
.
config
,
params
)
saveBuildAndRunParams
(
app
.
config
,
params
)
result
=
"Your parameters have correctly been updated"
result
=
"Your parameters have correctly been updated"
return
jsonify
(
code
=
code
,
result
=
result
)
return
jsonify
(
code
=
code
,
result
=
result
)
...
...
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