From 07e53d4b68c2e534bec08d3bae8eb697d6ec87a5 Mon Sep 17 00:00:00 2001
From: Marc Aymerich <glicerinu@gmail.com>
Date: Tue, 11 Nov 2014 16:59:13 +0000
Subject: [PATCH] Initial implementation of systemusers permissions

---
 TODO.md                                     | 3 +++
 orchestra/apps/payments/actions.py          | 2 +-
 orchestra/apps/systemusers/admin.py         | 3 +++
 orchestra/apps/webapps/backends/__init__.py | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/TODO.md b/TODO.md
index 405971b3..374574d0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -213,3 +213,6 @@ Remember that, as always with QuerySets, any subsequent chained methods which im
 * Service instance name when selecting content_type
 
 * Address.forward mailbbox validate not available on mailboxes
+
+
+* Miscellaneous service construct form for specific data, fields, validation, uniquenes.. etc (domain usecase)
diff --git a/orchestra/apps/payments/actions.py b/orchestra/apps/payments/actions.py
index 25741b8b..1e53cbb7 100644
--- a/orchestra/apps/payments/actions.py
+++ b/orchestra/apps/payments/actions.py
@@ -53,7 +53,7 @@ def process_transactions(modeladmin, request, queryset):
 
 @transaction.atomic
 @action_with_confirmation()
-def mark_as_executed(modeladmin, request, queryset, extra_context={}):
+def mark_as_executed(modeladmin, request, queryset):
     for trans in queryset:
         trans.mark_as_executed()
         modeladmin.log_change(request, trans, _("Executed"))
diff --git a/orchestra/apps/systemusers/admin.py b/orchestra/apps/systemusers/admin.py
index 6d6a7f3c..9c75e892 100644
--- a/orchestra/apps/systemusers/admin.py
+++ b/orchestra/apps/systemusers/admin.py
@@ -11,6 +11,7 @@ from orchestra.admin.utils import wrap_admin_view
 from orchestra.apps.accounts.admin import SelectAccountAdminMixin
 from orchestra.forms import UserCreationForm, UserChangeForm
 
+from .actions import grant_permission
 from .filters import IsMainListFilter
 from .models import SystemUser
 
@@ -42,6 +43,8 @@ class SystemUserAdmin(ChangePasswordAdminMixin, SelectAccountAdminMixin, Extende
     add_form = UserCreationForm
     form = UserChangeForm
     ordering = ('-id',)
+    actions = (grant_permission,)
+    change_view_actions = actions
     
     def display_active(self, user):
         return user.active
diff --git a/orchestra/apps/webapps/backends/__init__.py b/orchestra/apps/webapps/backends/__init__.py
index 5c7a0aa2..2b3165c1 100644
--- a/orchestra/apps/webapps/backends/__init__.py
+++ b/orchestra/apps/webapps/backends/__init__.py
@@ -37,7 +37,7 @@ class WebAppServiceMixin(object):
             value = "%s" % opt.value
             init_vars.append((name, value))
         enabled_functions = []
-        for value in options.filter(name='enabled_functions').values_list('value', flat=True):
+        for value in options.filter(name='php-enabled_functions').values_list('value', flat=True):
             enabled_functions += enabled_functions.get().value.split(',')
         if enabled_functions:
             disabled_functions = []