pedro/django-orchestra-test
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TODO.md
View file

@ -464,3 +464,6 @@ with open(file) as handler:
# DASHBOARD: Show owned tickets, scheduled actions, maintenance operations (diff domains) # DASHBOARD: Show owned tickets, scheduled actions, maintenance operations (diff domains)
# Add confirmation step on transaction actions like process transaction # 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
orchestra/contrib/saas/services/drupal.py
View file

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

3
orchestra/contrib/websites/forms.py
View file

@ -34,7 +34,8 @@ class WebsiteDirectiveInlineFormSet(forms.models.BaseInlineFormSet):
locations = set() locations = set()
for form in self.content_formset.forms: for form in self.content_formset.forms:
location = form.cleaned_data.get('path') 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)) locations.add(normurlpath(location))
values = defaultdict(list) values = defaultdict(list)