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

Issue-383: Click on some analyses pops up a new page instead of object log #454

Merged
merged 5 commits into from
Dec 7, 2017
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 @@ -16,6 +16,7 @@ Changelog

**Fixed**

- #454 Click on some analyses pops up a new page instead of object log
- #452 Traceback error when deleting attachment from Analysis Request
- #450 Traceback after clicking "Manage Results" in a WS w/o Analyses assigned
- #445 Fix AR Add Form: No sample points are found if a sample type was set
Expand Down
60 changes: 31 additions & 29 deletions bika/lims/browser/analysisservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,31 @@
# Copyright 2011-2016 by it's authors.
# Some rights reserved. See LICENSE.txt, AUTHORS.txt.

from bika.lims.browser import BrowserView
import json

from Products.CMFCore.utils import getToolByName
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile

from zope.component import adapts
from zope.interface import implements

import plone
import plone.protect

from magnitude import mg

from bika.lims import bikaMessageFactory as _
from bika.lims.jsonapi import load_field_values, get_include_fields
from bika.lims.utils import t
from bika.lims.config import POINTS_OF_CAPTURE
from bika.lims.browser import BrowserView
from bika.lims.browser.log import LogView
from bika.lims.config import POINTS_OF_CAPTURE
from bika.lims.content.analysisservice import getContainers
from bika.lims.browser.bika_listing import BikaListingView
from bika.lims.interfaces import IAnalysisService
from bika.lims.interfaces import IJSONReadExtender
from Products.CMFCore.utils import getToolByName
from magnitude import mg, MagnitudeError
from zope.component import adapts
from zope.interface import implements
import json, plone
import plone.protect
import re
from bika.lims.jsonapi import load_field_values, get_include_fields
from bika.lims.utils import to_unicode

### AJAX methods for AnalysisService context
# AJAX methods for AnalysisService context


class ajaxGetContainers(BrowserView):
"""ajax Preservation/Container widget filter
Expand All @@ -35,28 +39,28 @@ class ajaxGetContainers(BrowserView):
"""
def __call__(self):
plone.protect.CheckAuthenticator(self.request)
uc = getToolByName(self, 'uid_catalog')

allow_blank = self.request.get('allow_blank', False) == 'true'
show_container_types = json.loads(self.request.get('show_container_types', 'true'))
show_containers = json.loads(self.request.get('show_containers', 'true'))
minvol = self.request.get("minvol", "0")
try:
minvol = minvol.split()
minvol = minvol.split()
minvol = mg(float(minvol[0]), " ".join(minvol[1:]))
except:
minvol = mg(0)

containers = getContainers(
self.context,
minvol = minvol,
allow_blank = allow_blank,
minvol=minvol,
allow_blank=allow_blank,
show_containers=show_containers,
show_container_types=show_container_types,
)

return json.dumps(containers)


class ajaxServicePopup(BrowserView):

template = ViewPageTemplateFile("templates/analysisservice_popup.pt")
Expand Down Expand Up @@ -96,22 +100,20 @@ def __call__(self):
self.partsetup = self.service.getPartitionSetup()

# convert uids to comma-separated list of display titles
for i,ps in enumerate(self.partsetup):

self.partsetup[i]['separate'] = \
ps.has_key('separate') and _('Yes') or _('No')
for i, ps in enumerate(self.partsetup):
self.partsetup[i]['separate'] = 'separate' in ps and _('Yes') or _('No')

if type(ps['sampletype']) == str:
ps['sampletype'] = [ps['sampletype'],]
if isinstance(ps['sampletype'], basestring):
ps['sampletype'] = [ps['sampletype'], ]
sampletypes = []
for st in ps['sampletype']:
res = bsc(UID=st)
sampletypes.append(res and res[0].Title or st)
self.partsetup[i]['sampletype'] = ", ".join(sampletypes)

if ps.has_key('container'):
if type(ps['container']) == str:
self.partsetup[i]['container'] = [ps['container'],]
if 'container' in ps:
if isinstance(ps['container'], basestring):
self.partsetup[i]['container'] = [ps['container'], ]
try:
containers = [bsc(UID=c)[0].Title for c in ps['container']]
except IndexError:
Expand All @@ -120,9 +122,9 @@ def __call__(self):
else:
self.partsetup[i]['container'] = ''

if ps.has_key('preservation'):
if type(ps['preservation']) == str:
ps['preservation'] = [ps['preservation'],]
if 'preservation' in ps:
if isinstance(ps['preservation'], basestring):
ps['preservation'] = [ps['preservation'], ]
try:
preservations = [bsc(UID=c)[0].Title for c in ps['preservation']]
except IndexError:
Expand Down
Loading