From 53541b16a126ebf128ee793ce7b30435d334eb93 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Thu, 21 Jul 2016 11:28:43 +0000 Subject: [PATCH] Check deletion in directives formset cross-validation with contents for unique locations --- TODO.md | 3 +++ orchestra/contrib/saas/services/drupal.py | 2 +- orchestra/contrib/websites/forms.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 41056802..ed996aea 100644 --- a/TODO.md +++ b/TODO.md @@ -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 diff --git a/orchestra/contrib/saas/services/drupal.py b/orchestra/contrib/saas/services/drupal.py index 380821ac..e40291ed 100644 --- a/orchestra/contrib/saas/services/drupal.py +++ b/orchestra/contrib/saas/services/drupal.py @@ -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 diff --git a/orchestra/contrib/websites/forms.py b/orchestra/contrib/websites/forms.py index 1700fa49..fc4a5029 100644 --- a/orchestra/contrib/websites/forms.py +++ b/orchestra/contrib/websites/forms.py @@ -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)