diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html
index 14bf3e1..6e7b635 100644
--- a/users/templates/contractor_office.html
+++ b/users/templates/contractor_office.html
@@ -169,7 +169,7 @@
@@ -193,13 +193,12 @@
- { { ws.budget } }
+ <%= workSell.budget %>
@@ -255,10 +254,12 @@
var $portfoliosContainer = $('.-portfolios-container').first()
var portfolioItemTempl = _.template($portfoliosContainer.find('.-portfolio-item-templ').first().html())
var $morePortfBtn = $('.-more-portfolios-btn').first()
+ var portfAbsUrl = '/projects/portfolio/'
var $workSellsContainer = $('.-work-sells-container').first()
var workSellItemTempl = _.template($workSellsContainer.find('.-work-sell-item-templ').first().html())
var $moreWorkSellsfBtn = $('.-more-work-sells-btn').first()
+ var workSellAbsUrl = '/work_sell/'
var teamId = {{ contractor.team.pk }}
var contractorIds
@@ -284,7 +285,11 @@
$.get(portfUrl.href()).then(function(res) {
_.each(function(portfolio) {
- $portfoliosContainer.append(portfolioItemTempl({portfolio: portfolio}))
+ $portfoliosContainer.append(portfolioItemTempl({
+ portfolio: portfolio,
+ portfAbsUrl: portfAbsUrl + portfolio.id + '/',
+ trunc: _.truncate,
+ }))
}, res.results)
if (!res.next)
@@ -301,7 +306,11 @@
$.get(workSellUrl.href()).then(function(res) {
_.each(function(ws) {
- $workSellsContainer.append(workSellItemTempl({workSell: ws}))
+ $workSellsContainer.append(workSellItemTempl({
+ workSell: ws,
+ workSellAbsUrl: workSellAbsUrl + ws.id + '/',
+ trunc: _.truncate,
+ }))
}, res.results)
if (!res.next)
diff --git a/users/views.py b/users/views.py
index eba8e72..33b746c 100644
--- a/users/views.py
+++ b/users/views.py
@@ -376,21 +376,21 @@ class ContractorOfficeView(DetailView):
context['team_member_count'] = len(members)
compl_proj = []
- portfolios = []
- work_sells = []
+ # portfolios = [] # Fetched via DRF
+ # work_sells = [] # Fetched via DRF
compl_proj.extend(tuple(o.project for o in contractor.orders.filter(status='completed')))
- portfolios.extend(contractor.portfolios.all())
- work_sells.extend(contractor.work_sell.all())
+ # portfolios.extend(contractor.portfolios.all())
+ # work_sells.extend(contractor.work_sell.all())
for c in members:
compl_proj.extend(tuple(o.project for o in c.orders.filter(status='completed')))
- portfolios.extend(c.portfolios.all())
- work_sells.extend(c.work_sell.all())
+ # portfolios.extend(c.portfolios.all())
+ # work_sells.extend(c.work_sell.all())
context['completed_project_count'] = len(compl_proj)
- context['portfolios'] = portfolios
- context['work_sells'] = work_sells
+ # context['portfolios'] = portfolios
+ # context['work_sells'] = work_sells
context['reviews'] = Review.objects.filter(target_contractor__in=itertools.chain((contractor,), members))