added lease_id for nitos leases + do not reset slider on date change

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index b8c761a..e58a062 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -798,7 +798,7 @@ var SCHEDULER_COLWIDTH = 50;
                     SchedulerDateSelected = new Date(ev.date);\r
                     SchedulerDateSelected.setHours(0,0,0,0);\r
                     // Set slider to origin\r
-                    $('#tblSlider').slider('setValue', 0); // XXX\r
+                    //$('#tblSlider').slider('setValue', 0); // XXX\r
                     // Refresh leases\r
                     self._scope_clear_leases();\r
                     self._set_all_lease_slots();\r

diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index 8289f9e..db72dca 100644 (file)
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -60,6 +60,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
                 'lease.resource',
                 'lease.start_time',
                 'lease.end_time',
+                'lease.lease_id', # Important for NITOS identify already existing leases
                 #'user.user_hrn',
                 #'application.measurement_point.counter'
         )