X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=1ddea18f5d95c9b0988b7eac17cc9a3497bce637;hb=4cff7691aba786e1e2e94c5a9c86a27f1be96b5b;hp=06425a0a53beb757d281b27ec2129ab9b26f72aa;hpb=b34976c759e549dbfd112b80b2168d4c8d483b03;p=unfold.git

diff --git a/portal/accountview.py b/portal/accountview.py
index 06425a0a..1ddea18f 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -2,7 +2,7 @@ from unfold.loginrequired               import LoginRequiredAutoLogoutView
 #
 from manifold.core.query                import Query
 from manifold.manifoldapi               import execute_query
-from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account
+from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account
 #
 from ui.topmenu                         import topmenu_items, the_user
 #
@@ -426,10 +426,8 @@ def account_process(request):
         for platform_detail in platform_details:
             if platform_detail['platform'] == "fuseco":
                 platform_id = platform_detail['platform_id']
-        # generic function is not possible. [filter is not constant]
-        query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
-        results = execute_query(request,query)
-
+        user_params = {'user_id':user_id}
+        manifold_delete_account(request,platform_id,user_params)
         messages.info(request, 'Reference Account is removed from Fuseco platform. You have no access to Fuseco resources anymore.')
         return HttpResponseRedirect("/portal/account/")
 
@@ -437,9 +435,8 @@ def account_process(request):
         for platform_detail in platform_details:
             if platform_detail['platform'] == "ple":
                 platform_id = platform_detail['platform_id']
-        # generic function is not possible. [filter is not constant]
-        query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
-        results = execute_query(request,query)
+        user_params = {'user_id':user_id}
+        manifold_delete_account(request,platform_id,user_params)
         messages.info(request, 'Reference Account is removed from PLE platform. You have no access to PLE resources anymore.')
         return HttpResponseRedirect("/portal/account/")
     
@@ -447,9 +444,8 @@ def account_process(request):
         for platform_detail in platform_details:
             if platform_detail['platform'] == "omf":
                 platform_id = platform_detail['platform_id']
-        # generic function is not possible. [filter is not constant]
-        query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
-        results = execute_query(request,query)
+        user_params = {'user_id':user_id}
+        manifold_delete_account(request,platform_id,user_params)
         messages.info(request, 'Reference Account is removed from OMF:Nitos platform. You have no access to OMF:Nitos resources anymore.')
         return HttpResponseRedirect("/portal/account/")
     
@@ -457,7 +453,8 @@ def account_process(request):
         for platform_detail in platform_details:
             if platform_detail['platform'] == "wilab":
                 platform_id = platform_detail['platform_id']
-        # generic function is not possible. [filter is not constant]
+        user_params = {'user_id':user_id}
+        manifold_delete_account(request,platform_id,user_params)
         query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
         results = execute_query(request,query)
         messages.info(request, 'Reference Account is removed from Wilab platform. You have no access to Wilab resources anymore.')
@@ -467,9 +464,8 @@ def account_process(request):
         for platform_detail in platform_details:
             if platform_detail['platform'] == "iotlab":
                 platform_id = platform_detail['platform_id']
-        # generic function is not possible. [filter is not constant]
-        query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
-        results = execute_query(request,query)
+        user_params = {'user_id':user_id}
+        manifold_delete_account(request,platform_id,user_params)
         messages.info(request, 'Reference Account is removed from IOTLab platform. You have no access to IOTLab resources anymore.')
         return HttpResponseRedirect("/portal/account/")