Skip to content

Commit

Permalink
Check deletion in directives formset cross-validation with contents f…
Browse files Browse the repository at this point in the history
…or unique locations
  • Loading branch information
glic3rinu committed Jul 21, 2016
1 parent aa5935b commit 53541b1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion orchestra/contrib/saas/services/drupal.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion orchestra/contrib/websites/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ def clean(self):
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)
Expand Down

0 comments on commit 53541b1

Please sign in to comment.