Removes functionality to attach existing resources from templates (#2050

) * Removes attach-from-exisiting resource from project templates * Removes attach-from-exisiting resource from location templates * Removes attach-from-exisiting resource from relationship templates * Removes attach-from-exisiting resource from party templates * Deactivate functional tests on CI * Removes attach-from-exisiting resource from project templates * Removes HasUnattachedResourcesMixin from views * Remove dead code
Cadasta · May 21, 2020 · f638102 · f638102
1 parent ea9ca71
commit f638102
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 90 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -63,18 +63,6 @@ matrix:
     -
       if: type = push
       env: TOX_ENV=py35-django-unit
-    -
-      if: type IN (push, pull_request) AND branch = master
-      env: TOX_ENV=py35-functional-batch1
-    -
-      if: type IN (push, pull_request) AND branch = master
-      env: TOX_ENV=py35-functional-batch2
-    -
-      if: type IN (push, pull_request) AND branch = master
-      env: TOX_ENV=py35-functional-batch3
-    -
-      if: type IN (push, pull_request) AND branch = master
-      env: TOX_ENV=py35-functional-batch4
 
 script:
   - tox -e $TOX_ENV

diff --git a/cadasta/party/views/default.py b/cadasta/party/views/default.py
@@ -46,7 +46,6 @@ class PartiesDetail(LoginPermissionRequiredMixin,
                     JsonAttrsMixin,
                     mixins.PartyObjectMixin,
                     organization_mixins.ProjectAdminCheckMixin,
-                    resource_mixins.HasUnattachedResourcesMixin,
                     resource_mixins.DetachableResourcesListMixin,
                     generic.DetailView):
     template_name = 'party/party_detail.html'
@@ -193,7 +192,6 @@ def post(self, request, *args, **kwargs):
 class PartyResourcesNew(LoginPermissionRequiredMixin,
                         mixins.PartyResourceMixin,
                         organization_mixins.ProjectAdminCheckMixin,
-                        resource_mixins.HasUnattachedResourcesMixin,
                         generic.CreateView):
     template_name = 'party/resources_new.html'
     permission_required = update_permissions('party.resources.add')
@@ -204,7 +202,6 @@ class PartyRelationshipDetail(LoginPermissionRequiredMixin,
                               JsonAttrsMixin,
                               mixins.PartyRelationshipObjectMixin,
                               organization_mixins.ProjectAdminCheckMixin,
-                              resource_mixins.HasUnattachedResourcesMixin,
                               resource_mixins.DetachableResourcesListMixin,
                               generic.DetailView):
     template_name = 'party/relationship_detail.html'
@@ -279,7 +276,6 @@ def get_success_url(self):
 class PartyRelationshipResourceNew(LoginPermissionRequiredMixin,
                                    mixins.PartyRelationshipResourceMixin,
                                    organization_mixins.ProjectAdminCheckMixin,
-                                   resource_mixins.HasUnattachedResourcesMixin,
                                    generic.CreateView):
     template_name = 'party/relationship_resources_new.html'
     permission_required = update_permissions('tenure_rel.resources.add')

diff --git a/cadasta/party/views/mixins.py b/cadasta/party/views/mixins.py
@@ -123,9 +123,6 @@ def get_object(self):
 class PartyRelationshipResourceMixin(ResourceViewMixin,
                                      PartyRelationshipObjectMixin):
 
-    def get_content_object(self):
-        return self.get_object()
-
     def get_form_kwargs(self, *args, **kwargs):
         kwargs = {
             'project_id': self.get_project().id,

diff --git a/cadasta/resources/views/default.py b/cadasta/resources/views/default.py
@@ -16,7 +16,6 @@
 
 class ProjectResources(LoginPermissionRequiredMixin,
                        mixins.ProjectResourceMixin,
-                       mixins.HasUnattachedResourcesMixin,
                        mixins.DetachableResourcesListMixin,
                        organization_mixins.ProjectAdminCheckMixin,
                        generic.ListView):
@@ -65,7 +64,6 @@ def post(self, request, *args, **kwargs):
 
 class ProjectResourcesNew(LoginPermissionRequiredMixin,
                           mixins.ProjectResourceMixin,
-                          mixins.HasUnattachedResourcesMixin,
                           organization_mixins.ProjectAdminCheckMixin,
                           generic.CreateView):
     template_name = 'resources/project_add_new.html'

diff --git a/cadasta/resources/views/mixins.py b/cadasta/resources/views/mixins.py
@@ -114,30 +114,6 @@ def get_success_url(self):
         return reverse('resources:project_detail', kwargs=self.kwargs)
 
 
-class HasUnattachedResourcesMixin(ProjectMixin):
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-
-        # Determine the object that can have resources
-        if hasattr(self, 'get_content_object'):
-            # This is for views for uploading a new resource
-            # or the ProjectResources view
-            object = self.get_content_object()
-        elif hasattr(self, 'object'):
-            # This is for views that list entity resources
-            object = self.object
-
-        project_resource_set_count = self.get_project().resource_set.filter(
-            archived=False).count()
-        if (
-            project_resource_set_count > 0 and
-            project_resource_set_count != object.resources.count()
-        ):
-            context['has_unattached_resources'] = True
-
-        return context
-
-
 class DetachableResourcesListMixin(ProjectMixin):
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)

diff --git a/cadasta/spatial/views/default.py b/cadasta/spatial/views/default.py
@@ -67,7 +67,6 @@ class LocationDetail(LoginPermissionRequiredMixin,
                      JsonAttrsMixin,
                      mixins.SpatialUnitObjectMixin,
                      organization_mixins.ProjectAdminCheckMixin,
-                     resource_mixins.HasUnattachedResourcesMixin,
                      resource_mixins.DetachableResourcesListMixin,
                      generic.DetailView):
     template_name = 'spatial/location_detail.html'
@@ -175,7 +174,6 @@ def post(self, request, *args, **kwargs):
 class LocationResourceNew(LoginPermissionRequiredMixin,
                           mixins.SpatialUnitResourceMixin,
                           organization_mixins.ProjectAdminCheckMixin,
-                          resource_mixins.HasUnattachedResourcesMixin,
                           generic.CreateView):
     template_name = 'spatial/resources_new.html'
     permission_required = update_permissions('spatial.resources.add')

diff --git a/cadasta/templates/organization/project_wrapper.html b/cadasta/templates/organization/project_wrapper.html
@@ -76,7 +76,7 @@ <h1 class="{% if is_administrator or is_allowed_add_location or is_allowed_add_r
           </button>
           <ul class="dropdown-menu">
             {% if is_allowed_add_party %}<li><a href="{% url 'parties:add' object.organization.slug object.slug %}">{% trans "Add party" %}</a></li>{% endif %}
-            {% if is_allowed_add_resource %}<li><a href="{% url 'resources:project_add_existing' object.organization.slug object.slug %}">{% trans "Add resource" %}</a></li>{% endif %}
+            {% if is_allowed_add_resource %}<li><a href="{% url 'resources:project_add_new' object.organization.slug object.slug %}">{% trans "Add resource" %}</a></li>{% endif %}
             {% if is_allowed_add_resource and is_allowed_import %}<li role="separator" class="divider"></li>{% endif %}
             {% if is_allowed_import %}<li><a href="{% url 'organization:project-import' object.organization.slug object.slug %}" data-toggle="modal">{% trans "Import data" %}</a></li>{% endif %}
           </ul>

diff --git a/cadasta/templates/party/party_detail.html b/cadasta/templates/party/party_detail.html
@@ -86,24 +86,18 @@ <h2><span class="entity">{% trans "Party" %} </span>{{ party.name }}</h2>
             <div role="tabpanel" class="tab-pane" id="resources">
               {% if resource_list %}
                 <div class="top-btn pull-right top-add">
-                  {% if has_unattached_resources %}
-                    <a class="btn btn-primary btn-sm" href="{% url 'parties:resource_add' object.organization.slug object.slug party.id %}">
-                  {% else %}
-                    <a class="btn btn-primary btn-sm" href="{% url 'parties:resource_new' object.organization.slug object.slug party.id %}">
-                  {% endif %}
-                  <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
+                  <a class="btn btn-primary btn-sm" href="{% url 'parties:resource_new' object.organization.slug object.slug party.id %}">
+                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}
+                  </a>
                 </div>
                 {% include 'resources/table.html' %}
               {% else %}
                 <div>
                   <p>{% trans "This party does not have any attached resources. To attach a resource, select the button below." %}</p>
                   <div class="btn-full">
-                    {% if has_unattached_resources %}
-                      <a class="btn btn-primary" href="{% url 'parties:resource_add' object.organization.slug object.slug party.id %}">
-                    {% else %}
-                      <a class="btn btn-primary" href="{% url 'parties:resource_new' object.organization.slug object.slug party.id %}">
-                    {% endif %}
-                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
+                    <a class="btn btn-primary" href="{% url 'parties:resource_new' object.organization.slug object.slug party.id %}">
+                      <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}
+                    </a>
                    </div>
                 </div>
               {% endif %}

diff --git a/cadasta/templates/party/relationship_detail.html b/cadasta/templates/party/relationship_detail.html
@@ -44,23 +44,15 @@ <h4>{% trans "Details" %}</h4>
     <h4>{% trans "Resources" %}</h4>
     {% if resource_list %}
       <div class="top-btn pull-right top-add">
-        {% if has_unattached_resources %}
-        <a class="btn btn-primary btn-sm" href="{% url 'parties:relationship_resource_add' object.organization.slug object.slug relationship.id %}">
-        {% else %}
         <a class="btn btn-primary btn-sm" href="{% url 'parties:relationship_resource_new' object.organization.slug object.slug relationship.id %}">
-        {% endif %}
           <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
       </div>
       {% include 'resources/table_sm.html' %}
     {% else %}
       <div>
         <p>{% trans "This relationship does not have any attached resources. To attach a resource, select the button below." %}</p>
         <div class="btn-full">
-          {% if has_unattached_resources %}
-          <a class="btn btn-primary" href="{% url 'parties:relationship_resource_add' object.organization.slug object.slug relationship.id %}">
-          {% else %}
           <a class="btn btn-primary" href="{% url 'parties:relationship_resource_new' object.organization.slug object.slug relationship.id %}">
-          {% endif %}
             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
         </div>
       </div>

diff --git a/cadasta/templates/resources/modal_add_lib.html b/cadasta/templates/resources/modal_add_lib.html
@@ -10,10 +10,6 @@
               <span aria-hidden="true">&times;</span>
             </a>
             <h3 class="modal-title">{% trans "Attach from library" %}</h3>
-            <ul class="nav nav-tabs" role="tablist">
-              <li role="presentation" class="active"><a href="" role="tab">{% trans "Attach from library" %}</a></li>
-              <li role="presentation"><a href="{{ upload_url }}" role="tab">{% trans "Upload new" %}</a></li>
-            </ul>
           </div>
 
           <div class="modal-body">

diff --git a/cadasta/templates/resources/modal_upload.html b/cadasta/templates/resources/modal_upload.html
@@ -10,12 +10,6 @@
               <span aria-hidden="true">&times;</span>
             </a>
             <h3 class="modal-title">{% trans "Upload new resource" %}</h3>
-            {% if has_unattached_resources %}
-            <ul class="nav nav-tabs" role="tablist">
-              <li role="presentation"><a href="{{ add_lib_url }}" role="tab">{% trans "Attach from library" %}</a></li>
-              <li role="presentation" class="active"><a href="" role="tab">{% trans "Upload new" %}</a></li>
-            </ul>
-            {% endif %}
           </div>
 
           <div class="modal-body modal-6-12">

diff --git a/cadasta/templates/resources/project_list.html b/cadasta/templates/resources/project_list.html
@@ -18,11 +18,7 @@ <h2>{% trans "Resources" %}</h2>
         <div class="panel-body">
           {% if is_allowed_add_resource %}
           <div class="top-btn pull-right top-add">
-            {% if has_unattached_resources %}
-            <a class="btn btn-primary btn-sm" href="{% url 'resources:project_add_existing' project=object.slug organization=object.organization.slug %}">
-            {% else %}
             <a class="btn btn-primary btn-sm" href="{% url 'resources:project_add_new' project=object.slug organization=object.organization.slug %}">
-            {% endif %}
               <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
           </div>
           {% endif %}

diff --git a/cadasta/templates/spatial/location_detail.html b/cadasta/templates/spatial/location_detail.html
@@ -99,23 +99,15 @@ <h2 class="short">
       <div role="tabpanel" class="tab-pane" id="resources">
         {% if resource_list %}
           <div class="top-btn pull-right top-add">
-            {% if has_unattached_resources %}
-            <a class="btn btn-primary btn-sm" href="{% url 'locations:resource_add' object.organization.slug object.slug location.id %}">
-            {% else %}
             <a class="btn btn-primary btn-sm" href="{% url 'locations:resource_new' object.organization.slug object.slug location.id %}">
-            {% endif %}
               <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
           </div>
           {% include 'resources/table_sm.html' %}
         {% else %}
           <div>
             <p>{% trans "This location does not have any attached resources. To attach a resource, select the button below." %}</p>
             <div class="btn-full">
-              {% if has_unattached_resources %}
-              <a class="btn btn-primary" href="{% url 'locations:resource_add' object.organization.slug object.slug location.id %}">
-              {% else %}
               <a class="btn btn-primary" href="{% url 'locations:resource_new' object.organization.slug object.slug location.id %}">
-              {% endif %}
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Attach" %}</a>
             </div>
           </div>