Merge branch '90-expose-download-dataset-link-share-link' into 'master'

Resolve "Expose download dataset link (share link)"

Closes #90

See merge request !40

portal/templates/portal/secure/user/dataset_list.html

@@ -35,6 +35,14 @@ $(function() {
         container.load($(this).attr('href'));
         return false; // event.stopPropagation() and event.preventDefault()
     });
+
+    {% if dataset_details_url %}
+        var container = $("#details-container")
+        container.html('');
+        container.load("{{dataset_details_url}}");
+        return false; // event.stopPropagation() and event.preventDefault()
+    {% endif %}
+
 });
 
 </script>

portal/templates/portal/widgets/dataset_sharing.html

@@ -39,4 +39,19 @@
         {% endfor %}
         </ul>
     </dd>
+
+    <dt class="col-sm-3">{% trans 'Share link (download)' %}:</dt>
+    <dd class="col-sm-9">
+        <ul class="list-unstyled">
+            <a href="{% url 'user.dataset-download' object.id %}">https://{{ request.get_host }}{% url 'user.dataset-download' object.id %}</a>
+        </ul>
+    </dd>
+
+    <dt class="col-sm-3">{% trans 'Share link (details)' %}:</dt>
+    <dd class="col-sm-9">
+        <ul class="list-unstyled">
+            <a href="{% url 'user.dataset-details-view' object.id %}">https://{{ request.get_host }}{% url 'user.dataset-details-view' object.id %}</a>
+        </ul>
+    </dd>
+
 </dl>

portal/urls.py

@@ -31,7 +31,7 @@ from .views.secure.dataset import (AdminDataSetCreateView,
                                    DataSetDetailsView, DataSetFileListView,
                                    DataSetDisplayFieldsUpdateView,
                                    DataSetJSONListView, DataSetUpdateView,
-                                   DataSetView, DataSetDownload)
+                                   DataSetView, DataSetDownload, DataSetInitDetailsView)
 from .views.secure.institution import (InstitutionCreateView,
                                        InstitutionJSONListView,
                                        InstitutionUpdateView, InstitutionView)
@@ -103,6 +103,7 @@ urlpatterns = [
     path('secure/my-datasets/update/<int:pk>/display-fields', DataSetDisplayFieldsUpdateView.as_view(), name='user.dataset-display_fields-update'),
     path('secure/dataset/details/<int:pk>', DataSetDetailsView.as_view(), name='user.dataset-details'),
     path('secure/dataset/<int:pk>/file-list', DataSetFileListView.as_view(), name='user.dataset-file-list'),
+    path('secure/dataset/<int:pk>', DataSetInitDetailsView.as_view(), name='user.dataset-details-view'),
     path('secure/dataset/download/<int:pk>', DataSetDownload.as_view(), name='user.dataset-download'),
     path('secure/admin/datasets/', AdminDataSetView.as_view(), name='admin.datasets'),
     path('secure/admin/datasets/list/json/', AdminDataSetJSONListView.as_view(), name='admin.dataset-json-list'),

portal/views/secure/dataset.py

@@ -31,6 +31,20 @@ logger = logging.getLogger('debug')
 class DataSetView(LoginRequiredMixin, ActivePageViewMixin, AjaxDatatableBackboneMixin, TemplateView):
     page_title = _('DataSet Management')
     active_page = 'datasets'
+    model = DataSet
+    template_name = 'portal/secure/user/dataset_list.html'
+    create_url = reverse_lazy('user.dataset-create')
+    api_url = reverse_lazy('secure.dataset-json-list')
+    dt_struct = {
+        'id': 'all-datasets',
+        'headers': [_('Name'), _('Download ID'), _('Created On'), _('Last Update'), 'Actions']
+    }
+
+
+class DataSetInitDetailsView(LoginRequiredMixin, ActivePageViewMixin, AjaxDatatableBackboneMixin, DetailView):
+    page_title = _('DataSet Management')
+    active_page = 'datasets'
+    model = DataSet
     template_name = 'portal/secure/user/dataset_list.html'
     create_url = reverse_lazy('user.dataset-create')
     api_url = reverse_lazy('secure.dataset-json-list')
@@ -39,6 +53,13 @@ class DataSetView(LoginRequiredMixin, ActivePageViewMixin, AjaxDatatableBackbone
         'headers': [_('Name'), _('Download ID'), _('Created On'), _('Last Update'), 'Actions']
     }
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        o = self.get_object()
+        if o:
+            context['dataset_details_url'] = reverse('user.dataset-details', args=[o.id])
+        return context
+
 
 class AdminDataSetView(StaffViewMixin, DataSetView):
     template_name = 'portal/secure/admin/list.html'