from django import forms
from django.utils.safestring import mark_safe
from django.contrib.auth.admin import UserAdmin
-from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.contrib.admin.widgets import FilteredSelectMultiple, AdminTextareaWidget
from django.contrib.auth.forms import ReadOnlyPasswordHashField, AdminPasswordChangeForm
from django.contrib.auth.signals import user_logged_in
from django.utils import timezone
from suit.widgets import LinkedSelect
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, NoReverseMatch
+from django.utils.encoding import force_text, python_2_unicode_compatible
+from django.utils.html import conditional_escape, format_html
+from django.forms.utils import flatatt, to_current_timezone
from cgi import escape as html_escape
import django_evolution
else:
return "%s %s" % (icon, html_escape(obj.backend_status, quote=True))
+class UploadTextareaWidget(AdminTextareaWidget):
+ def render(self, name, value, attrs=None):
+ if value is None:
+ value = ''\r
+ final_attrs = self.build_attrs(attrs, name=name)\r
+ return format_html('<input type="file" style="width: 0; height: 0" id="btn_upload_%s" onChange="uploadTextarea(event,\'%s\');">' \\r
+ '<button onClick="$(\'#btn_upload_%s\').click(); return false;">Upload</button>' \\r
+ '<br><textarea{0}>\r\n{1}</textarea>' % (attrs["id"], attrs["id"], attrs["id"]),\r
+ flatatt(final_attrs),\r
+ force_text(value))
+
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
return mark_safe(backend_icon(obj))
backend_status_icon.short_description = ""
- def get_form(self, request, obj=None):
+ def get_form(self, request, obj=None, **kwargs):
# Save obj and request in thread-local storage, so suit_form_tabs can
# use it to determine whether we're in edit or add mode, and can
# determine whether the user is an admin.
_thread_locals.request = request
_thread_locals.obj = obj
- return super(PermissionCheckingAdminMixin, self).get_form(request, obj)
+ return super(PermissionCheckingAdminMixin, self).get_form(request, obj, **kwargs)
def get_inline_instances(self, request, obj=None):
inlines = super(PermissionCheckingAdminMixin, self).get_inline_instances(request, obj)
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentInline(PlStackTabularInline):
+class SiteDeploymentsInline(PlStackTabularInline):
model = SiteDeployments
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
if db_field.name == 'deployment':
kwargs['queryset'] = Deployment.select_by_user(request.user)
- return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+ return super(SiteDeploymentsInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
return SiteDeployments.select_by_user(request.user)
fields = ['backend_status_icon', 'network']
readonly_fields = ('backend_status_icon', )
-class ImageDeploymentsInline(PlStackTabularInline):
- model = ImageDeployments
+class ImageDeploymentInline(PlStackTabularInline):
+ model = ImageDeployment
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
self.fields['accessControl'].initial = "allow site " + request.user.site.name
if self.instance and self.instance.pk:
- self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments_set.all()]
- self.fields['images'].initial = [x.image for x in self.instance.imagedeployments_set.all()]
+ self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments.all()]
+ self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
self.fields['flavors'].initial = self.instance.flavors.all()
def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname):
# create/destroy the through models ourselves. There has to be
# a better way...
- self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployments, "deployment", "site")
- self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployments, "deployment", "image")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments.all(), SiteDeployments, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ImageDeployment, "deployment", "image")
self.save_m2m()
model = Deployment
fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
- inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentsInline]
+ inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentInline]
list_display = ['backend_status_icon', 'name']
list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ('backend_status_text', )
list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
list_display_links = ('backend_status_icon', 'name', )
filter_horizontal = ('deployments',)
- inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentInline]
+ inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentsInline]
search_fields = ['name']
def queryset(self, request):
suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
- inlines = [SliverInline, ImageDeploymentsInline]
+ inlines = [SliverInline, ImageDeploymentInline]
user_readonly_fields = ['name', 'disk_format', 'container_format']
class Meta:
model = User
+ widgets = { 'public_key': UploadTextareaWidget, }
def clean_password(self):
# Regardless of what the user provides, return the initial value.
fields = ['backend_status_icon', 'deployment','net_id','subnet_id']
readonly_fields = ('backend_status_icon', )
+class NetworkForm(forms.ModelForm):
+ class Meta:
+ model = Network
+ widgets = {
+ 'topologyParameters': UploadTextareaWidget,
+ 'controllerParameters': UploadTextareaWidget,
+ }
+
class NetworkAdmin(PlanetStackBaseAdmin):
list_display = ("backend_status_icon", "name", "subnet", "ports", "labels")
list_display_links = ('backend_status_icon', 'name', )
inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
admin_inlines = [NetworkDeploymentsInline]
+ form=NetworkForm
+
fieldsets = [
- (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
+ (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'],
+ 'classes':['suit-tab suit-tab-general']}),
+ (None, {'fields': ['topologyParameters', 'controllerUrl', 'controllerParameters'],
+ 'classes':['suit-tab suit-tab-sdn']}),
+ ]
readonly_fields = ('backend_status_text', )
user_readonly_fields = ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet']
@property
def suit_form_tabs(self):
tabs=[('general','Network Details'),
+ ('sdn', 'SDN Configuration'),
('netparams', 'Parameters'),
('networkslivers','Slivers'),
('networkslices','Slices'),
list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
user_readonly_inlines = []
+ fieldsets = [
+ (None, {'fields': ['name', 'description', 'guaranteedBandwidth', 'visibility', 'translation', 'sharedNetworkName', 'sharedNetworkId', 'topologyKind', 'controllerKind'],
+ 'classes':['suit-tab suit-tab-general']}),]
+ suit_form_tabs = (('general','Network Template Details'), )
class FlavorAdmin(PlanetStackBaseAdmin):
list_display = ("backend_status_icon", "name", "flavor", "order", "default")
git://git.onelab.eu / plstackapi.git / blobdiff