Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename _meta.module_name to _meta.model_name for compatibility with D… #2406

Merged
merged 1 commit into from
Dec 4, 2017
Merged

Rename _meta.module_name to _meta.model_name for compatibility with D… #2406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions refinery/core/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ class AnalysisResource(ModelResource):

class Meta:
queryset = Analysis.objects.all()
resource_name = Analysis._meta.module_name
resource_name = Analysis._meta.model_name
detail_uri_name = 'uuid' # for using UUIDs instead of pk in URIs
# required for public data set access by anonymous users
authentication = Authentication()
Expand Down Expand Up @@ -1009,14 +1009,14 @@ def dehydrate(self, bundle):
workflow_dict = None
try:
workflow_dict = ast.literal_eval(bundle.data['workflow_copy'])
except ValueError, e:
except ValueError as exc:
# TODO: Remove this and just let any errors bubble up.
# I don't think I should do that at this moment because
# I shouldn't make production any fussier about values
# in DB than it is right now.
logger.warn(
'%s: Cannot parse workflow as python repr: %s',
e, bundle.data['workflow_copy']
exc, bundle.data['workflow_copy']
)
if workflow_dict:
workflow_json = json.dumps(workflow_dict)
Expand All @@ -1026,16 +1026,13 @@ def dehydrate(self, bundle):

def get_object_list(self, request, **kwargs):
user = request.user
perm = 'read_%s' % DataSet._meta.module_name
if (user.is_authenticated()):
perm = 'read_%s' % DataSet._meta.model_name
if user.is_authenticated():
allowed_datasets = get_objects_for_user(user, perm, DataSet)
else:
allowed_datasets = get_objects_for_group(
ExtendedGroup.objects.public_group(),
perm,
DataSet
ExtendedGroup.objects.public_group(), perm, DataSet
)

return Analysis.objects.filter(
data_set__in=allowed_datasets.values_list("id", flat=True)
)
Expand Down