Fixes issues with shared with users, mostly defensive checks.

ckanext/knowledgehub/helpers.py

@@ -1549,6 +1549,7 @@ def get_all_users():
         if user.get('name') not in sysadmins:
             users.append(
                 {
+                    'id': user.get('id'),
                     'name': user.get('name'),
                     'display_name': user.get('fullname') or user.get('name')
                 }

ckanext/knowledgehub/logic/action/update.py

@@ -1839,7 +1839,7 @@ def _access_request_update(context, data_dict, granted=True):
                 'title': _('Request for access approved'),
                 'description': _('Your request for access has been approved.'),
                 'link': access_request.entity_link,
-                'recipient': access_request.user_id,
+                'recepient': access_request.user_id,
             })
         except Exception as e:
             log.error('Failed to send notification for access granted. '

ckanext/knowledgehub/model/posts.py

@@ -188,10 +188,13 @@ def load_related_data_visualization(cls, _id, related_data_ids):
     def load_related_data_dashboard(cls, _id, related_data_ids):
         dashboard = cls._call_action('dashboard_show', {'id': _id})
 
+        if not dashboard:
+            return
+
         tags = cls._try_clean_list(dashboard, 'tags')
         cls._load_tags_and_keywords(tags, related_data_ids)
 
-        indicators = dashboard.get('indicators', '').strip()
+        indicators = (dashboard.get('indicators', '') or '').strip()
         if indicators:
             indicators = json.loads(indicators)
             for indicator in indicators:

ckanext/knowledgehub/model/visualization.py

@@ -57,8 +57,9 @@ def before_index(data):
             {'ignore_auth': True},
             {'id': data['package_id'], 'include_tracking': True})
         if package:
-            data['organizations'] = package.get('organization', {}).get('name')
-            organization_id = package.get('organization', {}).get('id')
+            data['organizations'] = (package.get('organization',
+                                                 {}) or {}).get('name')
+            organization_id = (package.get('organization', {}) or {}).get('id')
             if organization_id:
                 permission_labels.append('member-%s' % organization_id)
 

ckanext/knowledgehub/plugin.py

@@ -466,10 +466,13 @@ def before_index(self, pkg_dict):
                         if resource_view.get('view_type') != 'recline_view':
                             rqs = resource_view.get('__extras', {}).\
                                 get('research_questions', '')
+                            if isinstance(rqs, str) or \
+                                    isinstance(rqs, unicode):
+                                rqs = map(lambda r: r.strip(),
+                                          filter(lambda r: r and r.strip(),
+                                                 rqs.split(',')))
                             if rqs:
-                                for rq in map(lambda r: r.strip(),
-                                              filter(lambda r: r and r.strip(),
-                                                     rqs.split(','))):
+                                for rq in rqs:
                                     try:
                                         rq = toolkit.get_action(
                                             'research_question_show')({
@@ -555,6 +558,7 @@ def get_user_dataset_labels(self, user_obj):
 
         labels.append(u'creator-%s' % user_obj.id)
         labels.append(u'user-%s' % user_obj.name)
+        labels.append(u'user-%s' % user_obj.id)
 
         orgs = logic.get_action(u'organization_list_for_user')(
             {u'user': user_obj.id}, {u'permission': u'read'})

ckanext/knowledgehub/templates/dashboard/snippets/dashboard_form.html

@@ -104,12 +104,13 @@ <h3>{{ _('Add visualizations based on Research Questions') }}</h3>
         <h3>{{ _('Share with') }}</h3>
 
         {% set users = h.get_all_users() %}
+        {% set shared_with_users = data.get('shared_with_users') or [] %}
         <div class="control-group">
           <label class="control-label" for="field_shared_with_users">{{ _("Users") }}</label>
           <div class="controls">
             <select id="field_shared_with_users" name="shared_with_users" data-module="autocomplete" multiple=False>
               {% for user in users  %}
-              <option value="{{ user.name }}" {% if user.name in (data.get('shared_with_users') or []) %} selected="selected"
+              <option value="{{ user.name }}" {% if (user.name in shared_with_users) or (user.id in shared_with_users) %} selected="selected"
                 {% endif %}>{{ user.display_name }}</option>
               {% endfor %}
             </select>

ckanext/knowledgehub/templates/package/snippets/package_metadata_fields.html

@@ -44,10 +44,11 @@ <h3>{{ _('Share with') }}</h3>
   {% set users = h.get_all_users() %}
   <div class="control-group">
     <label class="control-label" for="field_shared_with_users">{{ _("Users") }}</label>
+    {% set shared_with_users = data.get('shared_with_users') or [] %}
     <div class="controls">
       <select id="field_shared_with_users" name="shared_with_users" data-module="autocomplete" multiple=False>
         {% for user in users  %}
-        <option value="{{ user.name }}" {% if user.name in (data.get('shared_with_users') or []) %} selected="selected"
+        <option value="{{ user.name }}" {% if (user.name in shared_with_users) or (user.id in shared_with_users) %} selected="selected"
           {% endif %}>{{ user.display_name }}</option>
         {% endfor %}
       </select>