From 06c4fcde1552e811ac0900ad12f432c603695e6e Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 28 Nov 2017 22:33:33 +0100 Subject: [PATCH 1/3] Avoid KeyError in transposed view --- CHANGES.rst | 1 + bika/lims/browser/worksheet/views/analyses_transposed.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0f8e47eca5..a94a91d58a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -17,6 +17,7 @@ Changelog **Fixed** +- #429 Fix worksheet switch to transposed layout raises an Error - #420 Searches by term with custom indexes do not work in clients folder view - #410 Unable to select or deselect columns to be displayed in lists - #409 In Add Analyses view, analyses id are displayed instead of Analysis Request IDs diff --git a/bika/lims/browser/worksheet/views/analyses_transposed.py b/bika/lims/browser/worksheet/views/analyses_transposed.py index 9babe479a5..6cddf6c640 100644 --- a/bika/lims/browser/worksheet/views/analyses_transposed.py +++ b/bika/lims/browser/worksheet/views/analyses_transposed.py @@ -150,8 +150,8 @@ def get_workflow_actions(self): actions = new_actions # and these are removed - hidden_transitions = self.bika_listing.review_state['hide_transitions'] if 'hide_transitions' in self.bika_listing.review_state: + hidden_transitions = self.bika_listing.review_state['hide_transitions'] actions = [a for a in actions if a['id'] not in hidden_transitions] # cheat: until workflow_action is abolished, all URLs defined in From 5e307413ce272e86afbeb55612c16a2b09874787 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 28 Nov 2017 22:34:12 +0100 Subject: [PATCH 2/3] Fixed wrong colspan in transposed view --- bika/lims/browser/worksheet/templates/analyses_transposed.pt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bika/lims/browser/worksheet/templates/analyses_transposed.pt b/bika/lims/browser/worksheet/templates/analyses_transposed.pt index 4c98533c09..b0a79f39ba 100644 --- a/bika/lims/browser/worksheet/templates/analyses_transposed.pt +++ b/bika/lims/browser/worksheet/templates/analyses_transposed.pt @@ -55,7 +55,7 @@ Date: Tue, 28 Nov 2017 22:36:46 +0100 Subject: [PATCH 3/3] HTML formatting only --- .../templates/analyses_transposed.pt | 160 +++++++++--------- 1 file changed, 79 insertions(+), 81 deletions(-) diff --git a/bika/lims/browser/worksheet/templates/analyses_transposed.pt b/bika/lims/browser/worksheet/templates/analyses_transposed.pt index b0a79f39ba..276b4262f4 100644 --- a/bika/lims/browser/worksheet/templates/analyses_transposed.pt +++ b/bika/lims/browser/worksheet/templates/analyses_transposed.pt @@ -1,37 +1,36 @@
+ i18n:domain="bika" + tal:attributes="id view/bika_listing/form_id" + tal:define="form_id view/bika_listing/form_id; + review_state_id python:request.get(form_id+'_review_state', 'default'); + review_state python:[t for t in view.bika_listing.review_states + if t['id'] == review_state_id]; + review_state python:review_state and review_state[0] + or view.bika_listing.review_states[0]; + toggle_cols python:dict([(col, view.bika_listing.columns[col]) + for col in view.bika_listing.columns.keys() + if col in review_state['columns']]); + sm python:modules['AccessControl'].getSecurityManager(); + EditAnalyses python:sm.checkPermission('BIKA: Edit analyses', context); + ViewResults python:sm.checkPermission('BIKA: View Results', context); + tabindex view/tabindex; + user python:sm.getUser(); + roles python:user.getRoles(); + nr_cols python:len(review_state['columns']); + nr_cols python:view.bika_listing.show_select_column and nr_cols + 1 or nr_cols; + nr_cols python:view.bika_listing.show_sort_column and nr_cols + 1 or nr_cols; + nr_cols python:str(nr_cols);"> - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + - - - - + + + + -
- - - - - - - -
- - - - - - -
-
+ + + + + + + +
+ + + + + + +
+
+