archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Moved check is_attract_project() to AttractExtension.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-10-11 16:34:31 +02:00
parent 3c2a00b086
commit 300d31b119
2 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
attract/routes.py
View File

@@ -56,7 +56,6 @@ def attract_project_view(extra_project_projections=None, extension_props=False):
:type extension_props: bool
"""
from .node_types.task import node_type_task
from . import EXTENSION_NAME
if callable(extra_project_projections):
@@ -91,31 +90,14 @@ def attract_project_view(extra_project_projections=None, extension_props=False):
{'projection': projections},
api=api)
node_type_name = node_type_task['name']
node_type = project.get_node_type(node_type_name)
if not node_type:
log.warning('createProject url=%s does not have node type %r',
project_url, node_type_name)
is_attract = current_attract.is_attract_project(project,
test_extension_props=extension_props)
if not is_attract:
return error_project_not_setup_for_attract()
if extension_props:
try:
pprops = project.extension_props.attract
except AttributeError:
log.warning("attract_project_view(%s): Project url=%r doesn't have any"
" extension properties.", wrapped, project_url)
if log.isEnabledFor(logging.DEBUG):
import pprint
log.debug('Project: %s', pprint.pformat(project.to_dict()))
return error_project_not_setup_for_attract()
if pprops is None:
log.warning("attract_project_view(%s): Project url=%r doesn't have Attract"
" extension properties.", wrapped, project_url)
return error_project_not_setup_for_attract()
pprops = project.extension_props.attract
return wrapped(project, pprops, *args, **kwargs)
return wrapped(project, *args, **kwargs)
return wrapper