git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
69d3979
)
Scheduler plugin: nodes available now = false or boot_state = disabled are displayed...
author
Loic Baron
<loic.baron@lip6.fr>
Tue, 19 May 2015 16:06:32 +0000
(18:06 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Tue, 19 May 2015 16:06:32 +0000
(18:06 +0200)
plugins/scheduler2/static/js/scheduler2.js
patch
|
blob
|
history
diff --git
a/plugins/scheduler2/static/js/scheduler2.js
b/plugins/scheduler2/static/js/scheduler2.js
index
933f32f
..
f56e670
100755
(executable)
--- a/
plugins/scheduler2/static/js/scheduler2.js
+++ b/
plugins/scheduler2/static/js/scheduler2.js
@@
-637,12
+637,17
@@
var SCHEDULER_COLWIDTH = 50;
// Setup leases with a default free status...
$.each(this.scope_resources_by_key, function(resource_key, resource) {
resource.leases = [];
// Setup leases with a default free status...
$.each(this.scope_resources_by_key, function(resource_key, resource) {
resource.leases = [];
+ if(resource.available == 'false' || resource.boot_state == 'disabled'){
+ state = 'maintenance';
+ }else{
+ state = 'free';
+ }
var colspan_lease = resource.granularity / self._slot_length; //eg. 3600 / 1800 => 2 cells
time = SchedulerDateSelected.getTime();
for (i=0; i < self._all_slots.length / colspan_lease; i++) { // divide by granularity
resource.leases.push({
id: 'coucou',
var colspan_lease = resource.granularity / self._slot_length; //eg. 3600 / 1800 => 2 cells
time = SchedulerDateSelected.getTime();
for (i=0; i < self._all_slots.length / colspan_lease; i++) { // divide by granularity
resource.leases.push({
id: 'coucou',
- status: (time < now) ? 'disabled': 'free', // 'selected', 'reserved', 'maintenance' XXX pending ??
+ status: (time < now) ? 'disabled':
state, //
'free', // 'selected', 'reserved', 'maintenance' XXX pending ??
});
time += resource.granularity * 1000;
}
});
time += resource.granularity * 1000;
}