Check deletion in directives formset cross-validation with contents for unique locations

This commit is contained in:
Marc Aymerich 2016-07-21 11:28:43 +00:00
parent aa5935ba34
commit 53541b16a1
3 changed files with 6 additions and 2 deletions

View file

@ -464,3 +464,6 @@ with open(file) as handler:
# DASHBOARD: Show owned tickets, scheduled actions, maintenance operations (diff domains)
# Add confirmation step on transaction actions like process transaction
# SAVE INISTIAL PASSWORD from all services, and just use it to create the service, never update it

View file

@ -7,4 +7,4 @@ class DrupalService(SoftwareService):
name = 'drupal'
verbose_name = "Drupal"
icon = 'orchestra/icons/apps/Drupal.png'
site_domain = settings.SAAS_MOODLE_DOMAIN
site_domain = settings.SAAS_DRUPAL_DOMAIN

View file

@ -34,7 +34,8 @@ class WebsiteDirectiveInlineFormSet(forms.models.BaseInlineFormSet):
locations = set()
for form in self.content_formset.forms:
location = form.cleaned_data.get('path')
if location is not None:
delete = form.cleaned_data.get('DELETE')
if not delete and location is not None:
locations.add(normurlpath(location))
values = defaultdict(list)