Fixed setDefaultPriority and added a new upgrde step to set default o…

…n existing ARs

bika/lims/content/analysisrequest.py

@@ -839,7 +839,7 @@ def getDefaultMemberDiscount(self):
             else:
                 return "0.00"
 
-    def getDefaultPriority(self):
+    def setDefaultPriority(self):
         """ compute default priority """
         bsc = getToolByName(self, 'bika_setup_catalog')
         priorities = bsc(
@@ -848,10 +848,11 @@ def getDefaultPriority(self):
         for brain in priorities:
             obj = brain.getObject()
             if obj.getIsDefault():
-                return obj
+                self.setPriority(obj)
+                return
 
-        logging.error('Priority: no priority specified')
-        return None
+        logging.error('Priority: no default priority found')
+        return 
 
     security.declareProtected(View, 'getResponsible')
     def getResponsible(self):

bika/lims/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>3019</version>
+  <version>3020</version>
   <dependencies>
     <dependency>profile-jarn.jsi18n:default</dependency>
     <dependency>profile-Products.ATExtensions:default</dependency>

bika/lims/subscribers/analysisrequest.py

@@ -114,13 +114,11 @@ def AfterTransitionEventHandler(instance, event):
 def ObjectInitializedEventHandler(instance, event):
 
     if instance.portal_type != "AnalysisRequest":
-        #import pdb; pdb.set_trace()
         return
 
     priority = instance.getPriority()
     if priority:
-        #print 'Got priority'
         return
 
-    instance.setPriority(instance.getDefaultPriority())
+    instance.setDefaultPriority()
     return

bika/lims/upgrade/configure.zcml

@@ -219,4 +219,13 @@
         sortkey="1"
         profile="bika.lims:default"/>
 
+<genericsetup:upgradeStep
+        title="Set default Priority on ARs"
+        description=""
+        source="3019"
+        destination="3020"
+        handler="bika.lims.upgrade.to3020.upgrade"
+        sortkey="1"
+        profile="bika.lims:default"/>
+
 </configure>

bika/lims/upgrade/to3020.py

@@ -0,0 +1,21 @@
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from bika.lims import logger
+from bika.lims.permissions import *
+from Products.CMFCore import permissions
+from Products.CMFCore.utils import getToolByName
+from zExceptions import BadRequest
+
+
+def upgrade(tool):
+    portal = aq_parent(aq_inner(tool))
+    portal_catalog = getToolByName(portal, 'portal_catalog')
+
+    proxies = portal_catalog(portal_type="AnalysisRequest")
+    ars = [proxy.getObject() for proxy in proxies]
+    for ar in ars:
+        if not ar.getPriority():
+            ar.setDefaultPriority()
+
+
+    return True