From a36d77e0c9716b0f28b9fda031a751bac2ee11c1 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 29 Aug 2014 11:43:23 -0700 Subject: [PATCH] merge Amisha changes --- planetstack/core/dashboard/sites.py | 10 +- planetstack/core/models/user.py | 25 ++++- .../templates/admin/dashboard/tenant.html | 96 +++++++++++++++++-- 3 files changed, 115 insertions(+), 16 deletions(-) diff --git a/planetstack/core/dashboard/sites.py b/planetstack/core/dashboard/sites.py index 7200035..a100117 100644 --- a/planetstack/core/dashboard/sites.py +++ b/planetstack/core/dashboard/sites.py @@ -14,8 +14,8 @@ class AdminMixin(object): from django.conf.urls import patterns, url from views import DashboardCustomize, DashboardDynamicView, DashboardWelcomeView, DashboardAjaxView, SimulatorView, \ DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView, \ - TenantViewData,TenantCreateSlice, TenantAddOrRemoveSliverView, TenantPickSitesView, TenantDeleteSliceView, \ - TenantUpdateSlice, DashboardSliceInteractions + TenantViewData,TenantCreateSlice, TenantAddUser,TenantAddOrRemoveSliverView, TenantPickSitesView, TenantDeleteSliceView, \ + TenantUpdateSlice, DashboardSliceInteractions, RequestAccessView from views import view_urls @@ -37,6 +37,8 @@ class AdminMixin(object): name="customize"), url(r'^hpcdashuserslices/', self.admin_view(DashboardUserSiteView.as_view()), name="hpcdashuserslices"), + url(r'^welcome/$', self.admin_view(DashboardWelcomeView.as_view()), + name="welcome"), url(r'^hpcdashboard/', self.admin_view(DashboardAjaxView.as_view()), # DEPRECATED name="hpcdashboard"), url(r'^simulator/', self.admin_view(SimulatorView.as_view()), @@ -53,6 +55,10 @@ class AdminMixin(object): name="tenantview"), url(r'^createnewslice/$', self.admin_view(TenantCreateSlice.as_view()), name="createnewslice"), + url(r'^adduser/$', self.admin_view(TenantAddUser.as_view()), + name="adduser"), + url(r'^requestaccess/$', RequestAccessView.as_view(), + name="requestacces"), url(r'^updateslice/$', self.admin_view(TenantUpdateSlice.as_view()), name="updateslice"), url(r'^picksites/$', self.admin_view(TenantPickSitesView.as_view()), diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py index 44e3f14..eec0927 100644 --- a/planetstack/core/models/user.py +++ b/planetstack/core/models/user.py @@ -8,6 +8,8 @@ from core.models.site import Deployment from django.contrib.auth.models import AbstractBaseUser, BaseUserManager from timezones.fields import TimeZoneField from operator import itemgetter, attrgetter +from django.core.mail import EmailMultiAlternatives +from core.middleware import get_request # Create your models here. class UserManager(BaseUserManager): @@ -167,9 +169,24 @@ class User(AbstractBaseUser): def save(self, *args, **kwds): if not self.id: - self.set_password(self.password) + self.set_password(self.password) + if self.is_active: + if self.password=="!": + self.send_temporary_password() + self.username = self.email - super(User, self).save(*args, **kwds) + super(User, self).save(*args, **kwds) + + def send_temporary_password(self): + password = User.objects.make_random_password() + self.set_password(password) + subject, from_email, to = 'OpenCloud Account Credentials', 'support@opencloud.us', str(self.email) + text_content = 'This is an important message.' + userUrl=get_request().META['HTTP_ORIGIN'] + html_content = """

Your account has been created on OpenCloud. Please log in here to activate your account

Username: """+self.email+"""
Temporary Password: """+password+"""
Please change your password once you successully login into the site.

""" + msg = EmailMultiAlternatives(subject,text_content, from_email, [to]) + msg.attach_alternative(html_content, "text/html") + msg.send() @staticmethod def select_by_user(user): @@ -182,9 +199,9 @@ class User(AbstractBaseUser): sites = [sp.site for sp in site_privs if sp.role.role == 'pi'] # get site privs of users at these sites site_privs = SitePrivilege.objects.filter(site__in=sites) - user_ids = [sp.user.id for sp in site_privs] + [user.id] + user_ids = [sp.user.id for sp in site_privs] + [user.id] qs = User.objects.filter(Q(site__in=sites) | Q(id__in=user_ids)) - return qs + return qs class UserDashboardView(PlCoreBase): user = models.ForeignKey(User, related_name="dashboardViews") diff --git a/planetstack/templates/admin/dashboard/tenant.html b/planetstack/templates/admin/dashboard/tenant.html index bf49471..9560807 100644 --- a/planetstack/templates/admin/dashboard/tenant.html +++ b/planetstack/templates/admin/dashboard/tenant.html @@ -18,6 +18,16 @@ +
- + + +
+
+
@@ -182,7 +196,7 @@ $("#adv-service-level-dropdown").append(""); } for (row in imageData) { - $("#adv-image-dropdown").append(""); + $("#adv-image-dropdown").append(""); } for (row in dataSet) { $("#adv-dataset-dropdown").append(""); @@ -200,9 +214,11 @@ } } for (row in siteRows) { - var entry = siteRows[row]['siteName']; + //var entry = siteRows[row]['siteName']; + var entry = siteRows[row]; if (!(entry in tableData)) { - tableData[siteRows[row]['siteName']] = 0; + //tableData[siteRows[row]['siteName']] = 0; + tableData[siteRows[row]] = 0; } } for (row in tableData) { @@ -224,6 +240,7 @@ siteName: newRow, count: newTableData[newRow] - tableData[newRow], slice: $("#advTenantSliceDropDown").val(), + image: $("#adv-image-dropdown").val(), actionToDo: "add", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -242,6 +259,7 @@ siteName: newRow, count: tableData[newRow] - newTableData[newRow], slice: $("#advTenantSliceDropDown").val(), + image: $("#adv-image-dropdown").val(), actionToDo: "rem", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -333,14 +351,14 @@ } } - function UserSliceTable(rows,imageData,serviceLevelData,siteRows,dataSet) { + function UserSliceTable(rows,imageData,serviceLevelData,siteRows,dataSet,siteUsers) { //Add check for #dynamicusersliceinfo_filter label-> input having focus here $("
").attr('id', 'tenantSliceDataWrapper').appendTo('#tabs-5'); $("
").attr('id', 'advancedTenantSliceDataWrapper').appendTo('#tabs-5'); var sliceData = ''; sliceData += '
You have not uploaded your Public Key. Click here to upload it now.
Slice Name:
Service Level:
Image:
Go to Advanced View
'; var advSliceData = ''; - advSliceData += '
You have not uploaded your Public Key. Click here to upload it now.
Slice Name:

Service Level: Changes are potentially disruptive to existing slivers
Image: Changes are potentially disruptive to existing slivers
Network: List of port ranges(if any) e.g. 1021-1026,1029
Data Sets: Include Private Volume
'; + advSliceData += '
You have not uploaded your Public Key. Click here to upload it now.
Slice Name:

Service Level: Changes are potentially disruptive to existing slivers
Image: Changes are potentially disruptive to existing slivers
Network: List of port ranges(if any) e.g. 1021-1026,1029
Data Set: Include Private Volume
'; $('#tenantSliceDataWrapper').append(sliceData).css("display", "none"); $('#advancedTenantSliceDataWrapper').append(advSliceData); $("#advancedTenantSliceDataWrapper").css("display", "none"); @@ -356,6 +374,7 @@ $("
").attr('id', 'advTenantSiteTable').appendTo('#tabs-5').css("display", "none"); $('
 Create New Slice
').appendTo("#tabs-5"); $('
 Delete a Slice
').appendTo("#tabs-5"); + $('
 Add User
').appendTo("#tabs-5"); $('
Download Slice Details
').appendTo("#tabs-5"); $('
 Add/Remove Slivers
').appendTo("#tabs-5"); $('
Save
').appendTo("#tabs-5").css("display", "none"); @@ -386,6 +405,7 @@ data: { count: parseInt($("#numOfSlivers").val()), slice: $("#tenantSliceDropDown").val(), + image: $("#slice-image-value").html(), actionToDo: "add", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -412,6 +432,7 @@ $("#dialog-form").dialog("close"); data: { count: parseInt($("#numOfSlivers").val()), slice: $("#tenantSliceDropDown").val(), + image: $("#slice-image-value").html(), actionToDo: "rem", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -435,27 +456,70 @@ location.reload(); } }); $("#dialog-form").dialog("open"); + }); + $("#add-user-btn").unbind().click(function(){ + $("#add-slice-user").empty(); + for (row in siteUsers) { + $("#add-slice-user").append(""); + } + $("#add-user-form").dialog({ + autoOpen: false, + height: 200, + width: 350, + modal: true, + dialogClass: "tenantDialog", + buttons: { + "Submit": function () { + $.ajax({ + url: '/adduser/', + dataType: 'json', + data: { + sliceName: $("#advTenantSliceDropDown").val(), + userEmail: $("#add-slice-user").val(), + csrfmiddlewaretoken: "{{ csrf_token }}", // < here + state: "inactive" + }, + async: false, + type: 'POST', + success: function () { + location.reload(); + } + + }); + }, + Cancel: function () { + $(this).dialog("close"); + } + } + }); + $("#add-user-form").dialog("open"); + + }); $("#create-slice-btn").unbind().click(function () { $("#new-service-class").empty(); $("#new-image").empty(); + $("#add-user").empty(); $("#mount-data-sets").empty(); $("#new-network").empty(); for (row in serviceLevelData) { $("#new-service-class").append(""); } for (row in imageData) { - $("#new-image").append(""); + $("#new-image").append(""); } for (row in dataSet) { $("#mount-data-sets").append(""); } + for (row in siteUsers) { + $("#add-user").append(""); + } var nameOfSlice = $("#new-slice-name").val(); var nameOfServiceClass = $("#new-service-class").val(); var nameOfImage = $("#new-image").val(); $("#create-slice-form").dialog({ autoOpen: false, - height: 400, + height: 420, width: 400, modal: true, dialogClass: "tenantDialog", @@ -471,6 +535,7 @@ location.reload(); network: $("#new-network").val(), privateVolume: $("#private-vol").is(":checked"), mountDataSets: $("#mount-data-sets").val(), + userEmail: $("#add-user").val(), actionToDo: "add", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -495,6 +560,7 @@ location.reload(); data: { count: parseInt($("#number-of-slivers").val()), slice: $("#new-slice-name").val(), + image: $("#new-image").val(), actionToDo: "add", csrfmiddlewaretoken: "{{ csrf_token }}", // < here state: "inactive" @@ -563,9 +629,11 @@ location.reload(); var imageData = data['image']['rows']; //var networkData = data['network']['rows']; var serviceLevelData = data['sliceServiceClass']['rows']; - var siteRows = data['sites']['rows']; + //var siteRows = data['sites']['rows']; + var siteRows = data['availableSites']['rows']; var dataSet = data['mountDataSets']['rows']; - UserSliceTable(rows,imageData,serviceLevelData,siteRows,dataSet); + var siteUsers = data['siteUsers']; + UserSliceTable(rows,imageData,serviceLevelData,siteRows,dataSet,siteUsers); if(!(data['publicKey'])){ $(".public-key-warning").css("display","block"); } @@ -574,6 +642,14 @@ location.reload(); $("#tooltip").css("display", "none"); $("#basic-tooltip").css("display", "none"); $("#adv-tooltip").css("display", "none"); + if(!(data['role']=="pi"||data['role']=="admin")){ + $("#create-slice-btn").off(); + $("#create-slice-btn").css('background','grey'); + $("#delete-slice-btn").off(); + $("#delete-slice-btn").css('background','grey'); + $("#add-user-btn").off(); + $("#add-user-btn").css('background','grey'); + } }, complete: function () {} }); -- 2.43.0