Final build for 0.30.4

NearBeach/__init__.py

@@ -1,2 +1,2 @@
 name = "NearBeach"
-__version__ = "0.30.3"
+__version__ = "0.30.4"

NearBeach/views/request_for_change_views.py

@@ -17,7 +17,7 @@
     RequestForChangeGroupApproval,
     ListOfRFCStatus,
 )
-from django.db.models import Q
+from django.db.models import Q, F
 from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
 from django.urls import reverse
 from django.template import loader
@@ -67,12 +67,17 @@ def get_rfc_context(rfc_id):
     """
     # Get data
     rfc_results = RequestForChange.objects.get(rfc_id=rfc_id)
-    rfc_change_lead = User.objects.filter(id=rfc_results.rfc_lead.id).values(
+    rfc_change_lead = User.objects.filter(
+        id=rfc_results.rfc_lead.id
+    ).annotate(
+        profile_picture=F('userprofilepicture__document_id__document_key')
+    ).values(
         "id",
         "email",
         "first_name",
         "last_name",
         "username",
+        "profile_picture",
     )
     user_list = User.objects.filter(
         is_active=True,

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nearbeach",
-	"version": "0.30.3",
+	"version": "0.30.4",
 	"description": "NearBeach - an Open Source project management system built with Django web framework",
 	"main": "/src/js/app.js",
 	"directories": {

src/js/components/request_for_change/RfcInformation.vue

@@ -127,7 +127,7 @@
 							<tr>
 								<td>
 									<img
-										v-bind:src="`${staticUrl}/NearBeach/images/placeholder/people_tax.svg`"
+										v-bind:src="getProfilePicture(rfcChangeLead[0].profile_picture)"
 										alt="default profile"
 										class="default-user-profile"
 									/>
@@ -431,6 +431,14 @@
 				//Send data
 				this.sendUpdate(data_to_send);
 			},
+			getProfilePicture(profile_picture) {
+				//If customer profile is blank - return default picture
+				if (profile_picture === "" || profile_picture === null || profile_picture === undefined) {
+					return `${this.staticUrl}/NearBeach/images/placeholder/product_tour.svg`;
+				}
+
+				return `${this.rootUrl}private/${profile_picture}`;
+			},
 			getStatus() {
 				return this.rfcStatusDict[this.rfcResults[0].fields.rfc_status];
 			},