include region in opportunities

forecast-admin/forecast/opportunities/serializers.py

@@ -1,20 +1,21 @@
 from rest_framework import serializers
 from .models import Opportunity, Office, OSBUAdvisor
 
+class OfficeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Office
+        fields = ('organization', 'region')
+
 
 class OpportunitySerializer(serializers.ModelSerializer):
-    office = serializers.ReadOnlyField(source='office.organization')
+    # office = serializers.ReadOnlyField(source='office.organization')
+    office = OfficeSerializer()
 
     class Meta:
         model = Opportunity
         # exclude = ('owner',)
 
 
-class OfficeSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Office
-
-
 class OSBUAdvisorSerializer(serializers.ModelSerializer):
     class Meta:
         model = OSBUAdvisor

forecast-admin/forecast/static/assets/js/src/pagination.js

@@ -60,8 +60,12 @@ var startOpportunities = function(opportunityContainer, pageContainer) {
       '  <p class="office">' +
       '    <span>' + o.agency + '</span>';
       if(o.office) {
-        html += '    <span class="h5">|</span>' +
-        '    <span> ' + o.office + ' </span>';
+        html += '    <span class="h5">| </span>' +
+        '    <span> ' + o.office.organization + ' </span>';
+      }
+      if(o.office.region) {
+        html += '    <span class="h5"> | </span>' +
+        '    <span> ' + o.office.region + ' </span>';
       }
       html += '  </p>' +
       '  <p class="description"><a class="opportunity-top-link" href="/details/' + o.id + '">' + o.description + ' (#' + o.id + ')</a></p>' +