Adds resources to user profile request. re #4357

archesproject · Dec 22, 2018 · 915bb60 · 915bb60
1 parent 392de76
commit 915bb60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/arches/app/templates/views/user-profile-manager.htm b/arches/app/templates/views/user-profile-manager.htm
@@ -332,7 +332,7 @@ <h3 class="project-panel-title" data-bind="text: vm.mobilesurvey.name() === '' ?
 
                                             <div class="">
                                                 <div class="project-details">
-                                                    <a id="view-project-details-btn" class="text-primary text-semibold" data-bind="click: function(val){val.mobilesurvey.toggleShowDetails(); val.getMobileSurveyResources(val)}">{% trans 'View Details' %}</a>
+                                                    <a id="view-project-details-btn" class="text-primary text-semibold" data-bind="click: function(val){val.mobilesurvey.toggleShowDetails();}">{% trans 'View Details' %}</a>
                                                 </div>
                                             </div>
                                         </div>

diff --git a/arches/app/views/user.py b/arches/app/views/user.py
@@ -150,6 +150,7 @@ def post(self, request):
             return render(request, 'views/user-profile-manager.htm', context)
 
     def get_mobile_survey_resources(self, mobile_survey_models):
+        graphs = models.GraphModel.objects.filter(isresource=True).exclude(graphid=settings.SYSTEM_SETTINGS_RESOURCE_MODEL_ID)
         resources = []
         mobile_surveys = []
         all_ordered_card_ids = []
@@ -160,4 +161,12 @@ def get_mobile_survey_resources(self, mobile_survey_models):
             all_ordered_card_ids += mobile_survey_dict['cards']
             mobile_surveys.append(mobile_survey_dict)
 
+        active_graphs = set([unicode(card.graph_id) for card in models.CardModel.objects.filter(cardid__in=all_ordered_card_ids)])
+
+        for i, graph in enumerate(graphs):
+            cards = []
+            if i == 0 or unicode(graph.graphid) in active_graphs:
+                cards = [Card.objects.get(pk=card.cardid) for card in models.CardModel.objects.filter(graph=graph)]
+            resources.append({'name': graph.name, 'id': graph.graphid, 'subtitle': graph.subtitle, 'iconclass': graph.iconclass, 'cards': cards})
+
         return mobile_surveys, resources