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.

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

Fix adapter priority for widget visibility #1425

Merged
merged 6 commits into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Changelog

**Fixed**

- #1425 Fix adapter priority for widget visibility
- #1421 Fix Search Query for Batches Listing
- #1418 Subscriber adapters not supported in clients listing
- #1419 Mixed permissions for transitions in client workflow
Expand Down
9 changes: 6 additions & 3 deletions bika/lims/adapters/widgetvisibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class RegistryHiddenFieldsVisibility(SenaiteATWidgetVisibility):
def __init__(self, context):
field_names = getHiddenAttributesForClass(context.portal_type)
super(RegistryHiddenFieldsVisibility, self).__init__(
context=context, sort=-1, field_names=[field_names,])
context=context, sort=float("inf"), field_names=[field_names, ])

def isVisible(self, field, mode="view", default="visible"):
return "invisible"
Expand Down Expand Up @@ -219,7 +219,7 @@ class SecondaryDateSampledFieldVisibility(SenaiteATWidgetVisibility):
"""
def __init__(self, context):
super(SecondaryDateSampledFieldVisibility, self).__init__(
context=context, sort=3, field_names=["DateSampled"])
context=context, sort=20, field_names=["DateSampled"])

def isVisible(self, field, mode="view", default="visible"):
"""Returns whether the field is visible in a given mode
Expand All @@ -230,7 +230,10 @@ def isVisible(self, field, mode="view", default="visible"):
# If this is a Secondary Analysis Request, this field is not editable
if IAnalysisRequestSecondary.providedBy(self.context):
return "invisible"
return default

# Delegate to SamplingFieldsVisibility adapter
return SamplingFieldsVisibility(self.context).isVisible(
field, mode=mode, default=default)


class PrimaryAnalysisRequestFieldVisibility(SenaiteATWidgetVisibility):
Expand Down
9 changes: 4 additions & 5 deletions bika/lims/monkey/Widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ def isVisible(self, instance, mode='view', default="visible", field=None):
continue
adapter_state = adapter(instance, mode, field, state)
adapter_name = adapter.__class__.__name__
logger.info("IATWidgetVisibility rule {} for {}.{} ({}): {} -> {}"
.format(adapter_name, instance.id, field.getName(), mode, state,
adapter_state))
if adapter_state == state:
continue
logger.info(
"IATWidgetVisibility: <{} for {}.{} mode:{} sort:{}> {} -> {}"
.format(adapter_name, instance.id, field.getName(), mode,
adapter.sort, state, adapter_state))
return adapter_state

return state