Skip to content

Commit

Permalink
additional checks when creating coroutine list
Browse files Browse the repository at this point in the history
  • Loading branch information
Karolis Rusenas committed Aug 18, 2015
1 parent 86278cd commit 9ca58a8
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions handlers/web_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,22 @@ class SFHandler(BaseHandler):
@gen.coroutine
def get(self):
sf_obj = SFAccess(self.settings)
utilisation_data, consultant_bilability = yield [sf_obj.get_utilisation_report(self.settings["consultantUtilisation"]),
sf_obj.get_billability_report(self.settings["consultantBillability"])]

data = {
"utilisation_data": utilisation_data,
"consultant_bilability": consultant_bilability
}
return self.render('salesforce.html', data=data)
coroutine_list = []

# checking whether report IDs were supplied
if "consultantUtilisation" in self.settings:
coroutine_list.append(sf_obj.get_utilisation_report(self.settings["consultantUtilisation"]))
if "consultantBillability" in self.settings:
coroutine_list.append(sf_obj.get_billability_report(self.settings["consultantBillability"]))
if coroutine_list:
utilisation_data, consultant_bilability = yield coroutine_list

data = {
"utilisation_data": utilisation_data,
"consultant_bilability": consultant_bilability
}
return self.render('salesforce.html', data=data)
else:
return self.render_string('error.html',
error="consultantUtilisation and consultantBillability report IDs were "
"not found in configuration")

0 comments on commit 9ca58a8

Please sign in to comment.