--- a/app/soc/models/job.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/models/job.py Sat Apr 18 14:04:39 2009 +0000
@@ -23,10 +23,9 @@
from google.appengine.ext import db
-from django.utils.translation import ugettext
+from soc.models import base
-from soc.models import base
-from soc.models import priority_group
+import soc.models.priority_group
class Job(base.ModelWithFieldAttributes):
@@ -35,8 +34,8 @@
#: reference to the priority group this job belongs to
priority_group = db.ReferenceProperty(
- reference_class=priority_group.PriorityGroup, required=True,
- collection_name='jobs')
+ reference_class=soc.models.priority_group.PriorityGroup,
+ required=True, collection_name='jobs')
#: the name of the task as defined in soc.cron.job
task_name = db.StringProperty(required=True)
--- a/app/soc/views/models/base.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/views/models/base.py Sat Apr 18 14:04:39 2009 +0000
@@ -291,7 +291,6 @@
params=params, page_name=page_name, **kwargs)
params = new_params
- logic = params['logic']
context = helper.responses.getUniversalContext(request)
helper.responses.useJavaScript(context, params['js_uses_all'])
--- a/app/soc/views/models/cron.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/views/models/cron.py Sat Apr 18 14:04:39 2009 +0000
@@ -22,17 +22,12 @@
]
-from django import forms
from django import http
-from soc.logic import cleaning
from soc.logic import dicts
from soc.logic.models.priority_group import logic as priority_group_logic
from soc.logic.models.job import logic as job_logic
from soc.views.helper import access
-from soc.views.helper import decorators
-from soc.views.helper import dynaform
-from soc.views.helper import widgets
from soc.views.models import base
import soc.cron.job
--- a/app/soc/views/models/job.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/views/models/job.py Sat Apr 18 14:04:39 2009 +0000
@@ -24,12 +24,10 @@
from django import forms
-from soc.logic import cleaning
from soc.logic import dicts
from soc.logic.models.job import logic as job_logic
from soc.views.helper import access
from soc.views.helper import decorators
-from soc.views.helper import dynaform
from soc.views.helper import widgets
from soc.views.models import base
--- a/app/soc/views/models/organization.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/views/models/organization.py Sat Apr 18 14:04:39 2009 +0000
@@ -278,7 +278,7 @@
# show the amount of slots assigned on the webpage
context['slots_visible'] = True
- ranking_keys = dict([(k.key(),v) for k,v in ranking.iteritems()])
+ ranking_keys = dict([(k.key(), v) for k, v in ranking.iteritems()])
proposal_keys = [i.key() for i in assigned_proposals]
# update the prop_list with the ranking and coloring information
--- a/app/soc/views/models/priority_group.py Sat Apr 18 14:04:11 2009 +0000
+++ b/app/soc/views/models/priority_group.py Sat Apr 18 14:04:39 2009 +0000
@@ -22,15 +22,10 @@
]
-from django import forms
-
-from soc.logic import cleaning
from soc.logic import dicts
from soc.logic.models.priority_group import logic as priority_group_logic
from soc.views.helper import access
from soc.views.helper import decorators
-from soc.views.helper import dynaform
-from soc.views.helper import widgets
from soc.views.models import base