reorganize imports

diff --git a/qcg/service.py b/qcg/service.py
index e7316a6..99fdf36 100644 (file)
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -10,6 +10,7 @@ from pyqcg.utils import Credential, TimePeriod, JobStatus, TaskStatus
 
 from qcg.models import User, Job, Task, Allocation, NodeInfo
 
+__all__ = ['update_user_data', 'update_job', 'submit', 'cancel', 'clean', 'fetch_resources']
 
 logger = logging.getLogger(__name__)
 

diff --git a/qcg/views.py b/qcg/views.py
index dae0ad4..289e398 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -24,7 +24,7 @@ from filex.views import make_url
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet, JobTemplateForm
 from qcg.models import JobTemplate
 from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted, cached_resources
-from qcg.service import update_user_data, update_job, cancel, clean, submit
+from qcg import service
 
 
 from django.utils import encoding
@@ -73,7 +73,7 @@ def parse_date(string):
 
 @restricted
 def jobs_list(request):
-    update_user_data(request.user, request.session['proxy'])
+    service.update_user_data(request.user, request.session['proxy'])
 
     tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
         .select_related('job').prefetch_related('allocations__nodes')
@@ -177,7 +177,7 @@ def task_details(request, job_id, task_id):
 
 def process_details(request, job, task=None):
     if not job.terminated or not job.purged:
-        update_job(job, request.session['proxy'])
+        service.update_job(job, request.session['proxy'])
 
     form_data = to_form_data(job.qcg_description)
     env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())]
@@ -247,7 +247,7 @@ def job_submit(request, template_id=None):
 
                 return redirect(template)
 
-            job = submit(job_desc, request.session['proxy'])
+            job = service.submit(job_desc, request.session['proxy'])
 
 
             messages.success(request,
@@ -271,28 +271,28 @@ def job_submit(request, template_id=None):
 @login_required
 def job_cancel(request, job_id):
     job = get_object_or_404(request.user.jobs, job_id=job_id)
-    return obj_run(request, job, cancel, u'Zadanie anulowano.')
+    return obj_run(request, job, service.cancel, u'Zadanie anulowano.')
 
 
 @require_POST
 @login_required
 def task_cancel(request, job_id, task_id):
     task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)
-    return obj_run(request, task, task, u'Zadanie anulowano.')
+    return obj_run(request, task, service.cancel, u'Zadanie anulowano.')
 
 
 @require_POST
 @login_required
 def job_clean(request, job_id):
     job = get_object_or_404(request.user.jobs, job_id=job_id)
-    return obj_run(request, job, clean, u'Usunięto katalog roboczy.')
+    return obj_run(request, job, service.clean, u'Usunięto katalog roboczy.')
 
 
 @require_POST
 @login_required
 def task_clean(request, job_id, task_id):
     task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)
-    return obj_run(request, task, clean, u'Usunięto katalog roboczy.')
+    return obj_run(request, task, service.clean, u'Usunięto katalog roboczy.')
 
 
 def obj_run(request, obj, func, msg):