From: Jordan Augé Date: Tue, 8 Jul 2014 03:18:54 +0000 (+0200) Subject: fixed scheduler bugs X-Git-Tag: myslice-1.1~44 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=376307342a51ecd274fc8c0d24a14030c73cd292;p=unfold.git fixed scheduler bugs --- diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js index 15477a42..eb5f834d 100644 --- a/plugins/querytable/static/js/querytable.js +++ b/plugins/querytable/static/js/querytable.js @@ -97,7 +97,7 @@ QUERYTABLE_BGCOLOR_REMOVED = 2; sPaginationType: 'bootstrap', // Handle the null values & the error : Datatables warning Requested unknown parameter // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2 - aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}], + aoColumnDefs: [{sDefaultContent: '', aTargets: [ '_all' ]}], // WARNING: this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty // sScrollX: '100%', /* Horizontal scrolling */ bProcessing: true, /* Loading */ diff --git a/plugins/scheduler2/static/css/scheduler2.css b/plugins/scheduler2/static/css/scheduler2.css index 22729f12..ffbe4f1d 100755 --- a/plugins/scheduler2/static/css/scheduler2.css +++ b/plugins/scheduler2/static/css/scheduler2.css @@ -285,8 +285,17 @@ background: #E8E8E8; /* latest stuff */ .sliderContainer { - margin:0; + margin-left: -15px; + margin-right: 15px; } .table-responsive{ overflow: hidden !important; } +input { + min-width: 150px !important; + margin-left: 5px; +} + +.slider.slider-horizontal { + width: 100%; +} diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js index 77545c02..0b5339fe 100755 --- a/plugins/scheduler2/static/js/scheduler2.js +++ b/plugins/scheduler2/static/js/scheduler2.js @@ -226,7 +226,7 @@ var SCHEDULER_COLWIDTH = 50; } manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data); /* Remove from local cache also, unless we listen to events from outside */ - $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; }); + $scope._leases_by_resource[other.resource] = $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; }); } @@ -278,7 +278,7 @@ var SCHEDULER_COLWIDTH = 50; } manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data); /* Remove from local cache also, unless we listen to events from outside */ - $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; }); + $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; }); return false; // ~ break }); @@ -305,9 +305,9 @@ var SCHEDULER_COLWIDTH = 50; op : STATE_SET_REMOVE, value: other_key } - manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, other_key); + manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data); /* Remove from local cache also, unless we listen to events from outside */ - $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; }); + $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; }); return false; // ~ break }); } diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html index 9d01851f..6edc88eb 100755 --- a/plugins/scheduler2/templates/scheduler.html +++ b/plugins/scheduler2/templates/scheduler.html @@ -8,24 +8,25 @@
-
- +
+
-
-
-
- - - -
-
-
-
-
-
-
+
+
+
+
+ + + +
+
+
+
+
+
+
diff --git a/portal/templates/base.html b/portal/templates/base.html index 449c5d22..970eefd8 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -7,7 +7,7 @@ {# This is where insert_str will end up #}{% media_container prelude %} {% include 'messages-transient-header.html' %} - +