localcosmos-app-kit 0.9.14__py3-none-any.whl → 0.9.16__py3-none-any.whl

app_kit/admin_urls.py

@@ -136,4 +136,9 @@ urlpatterns = [
          views.ManageAppKitExternalMedia.as_view(), name='update_app_kit_external_media'),
     path('delete-external-media/<int:meta_app_id>/<int:pk>/',
          views.DeleteAppKitExternalMedia.as_view(), name='delete_app_kit_external_media'),
+    # licences
+    path('list-images-and-licences/<int:meta_app_id>/',
+         views.ListImagesAndLicences.as_view(), name='list_images_and_licences'),
+    path('manage-content-licence/<int:meta_app_id>/<int:registry_entry_id>/',
+         views.ManageContentLicence.as_view(), name='manage_content_licence'),
 ]

app_kit/appbuilder/AppReleaseBuilder.py

@@ -916,10 +916,10 @@ class AppReleaseBuilder(AppBuilderBase):
 
         # detect duplicates by name
         all_taxon_profiles = TaxonProfile.objects.filter(taxon_profiles=taxon_profiles)
-        for taxon_profile in all_taxon_profiles:
+        for taxon_profile in all_taxon_profiles:            
             duplicates = TaxonProfile.objects.filter(taxon_profiles=taxon_profiles,
                 taxon_source=taxon_profile.taxon_source, taxon_latname=taxon_profile.taxon_latname,
-                taxon_author=taxon_profile.taxon_author).exclude(pk=taxon_profile.pk)
+                taxon_author=taxon_profile.taxon_author, morphotype=taxon_profile.morphotype).exclude(pk=taxon_profile.pk)
             if duplicates.exists():
                 warning_message = _('The taxon profile of %(taxon_latname)s has duplicates.') % {
                     'taxon_latname':taxon_profile.taxon_latname}

app_kit/appbuilder/TaxonBuilder.py

@@ -332,33 +332,41 @@ class TaxonSerializer:
         if name_type not in self.taxa_builder.cache['search']:
             self.taxa_builder.cache['search'][name_type] = {}
             
-        if name in self.taxa_builder.cache['search'][name_type]:
-            search_taxon_json = self.taxa_builder.cache['search'][name_type][name]
+        if name not in self.taxa_builder.cache['search'][name_type]:
+             # the same name might occur in different taxonomies
+            self.taxa_builder.cache['search'][name_type][name] = {}
             
-        else:
-        
-            if not accepted_name_uuid:
-                accepted_name_uuid = self.lazy_taxon.name_uuid
-                
-            if accepted_name_uuid:
-                accepted_name_uuid = str(accepted_name_uuid)
-                
-            has_taxon_profile = False
-            taxon_profile = self.get_taxon_profile()
-            if taxon_profile:
-                has_taxon_profile = True
+        if name in self.taxa_builder.cache['search'][name_type]:
+            # the same name might occur in different taxonomies
+            taxon_source = self.lazy_taxon.taxon_source
             
-            search_taxon_json = self.serialize_extended()
+            if taxon_source in self.taxa_builder.cache['search'][name_type][name]:
+                search_taxon_json = self.taxa_builder.cache['search'][name_type][name][taxon_source]
             
-            search_taxon_json.update({
-                'nameType': name_type,
-                'name': name,
-                'isPreferredName': is_preferred_name,
-                'acceptedNameUuid': accepted_name_uuid,
-                'hasTaxonProfile': has_taxon_profile,
-            })
+            else:
             
-            self.taxa_builder.cache['search'][name_type][name] = search_taxon_json
+                if not accepted_name_uuid:
+                    accepted_name_uuid = self.lazy_taxon.name_uuid
+                    
+                if accepted_name_uuid:
+                    accepted_name_uuid = str(accepted_name_uuid)
+                    
+                has_taxon_profile = False
+                taxon_profile = self.get_taxon_profile()
+                if taxon_profile:
+                    has_taxon_profile = True
+                
+                search_taxon_json = self.serialize_extended()
+                
+                search_taxon_json.update({
+                    'nameType': name_type,
+                    'name': name,
+                    'isPreferredName': is_preferred_name,
+                    'acceptedNameUuid': accepted_name_uuid,
+                    'hasTaxonProfile': has_taxon_profile,
+                })
+                
+                self.taxa_builder.cache['search'][name_type][name][taxon_source] = search_taxon_json
         
         search_taxon_json_copy = copy.deepcopy(search_taxon_json)
         

app_kit/appbuilder/app/frontends/Multiverse/settings.json

@@ -69,8 +69,8 @@
   },
   "cordova" : {
     "platforms" : {
-      "android" : "android@13.0.0",
-      "ios" : "ios@7.1.0",
+      "android" : "android@14.0.1",
+      "ios" : "ios@8.0.0",
       "browser" : "browser@7.0.0"
     },
     "plugins" : [

app_kit/features/nature_guides/matrix_filter_forms.py

@@ -5,7 +5,7 @@ from django import forms
 
 from localcosmos_server.forms import LocalizeableForm
 
-from .models import MatrixFilter
+from .models import MatrixFilter, IDENTIFICATION_MODE_POLYTOMOUS
 from .matrix_filters import MATRIX_FILTER_TYPES
 
 from .forms import is_active_field
@@ -63,6 +63,22 @@ class MatrixFilterManagementForm(LocalizeableForm):
                 raise forms.ValidationError(_('A matrix filter with this name already exists.'))
 
         return name
+    
+    
+    def clean(self):
+        cleaned_data = super().clean()
+
+        identification_mode = self.meta_node.identification_mode
+        
+        if identification_mode == IDENTIFICATION_MODE_POLYTOMOUS and not self.matrix_filter:
+            
+            filter_exists = MatrixFilter.objects.filter(meta_node=self.meta_node).exists()
+            
+            if filter_exists:
+                raise forms.ValidationError(_('In polytomous identification mode, only one matrix filter is allowed.'))
+            
+        
+        return cleaned_data
 
 
 class MatrixFilterManagementFormWithUnit(MatrixFilterManagementForm):

app_kit/features/nature_guides/models.py

@@ -1130,6 +1130,7 @@ class CrosslinkManager:
 
         is_circular = False
 
+        # you may not link a node to one of its parents
         if crosslink[0].startswith(crosslink[1]):
             is_circular = True
 
@@ -1156,17 +1157,17 @@ class CrosslinkManager:
 
         if is_circular == False:
 
-            found_connection = True
-
             for crosslink in crosslinks:
 
                 # start a new chain
                 chain = [crosslink]
+                found_connection = True
             
                 while found_connection == True and is_circular == False:
                     
                     for crosslink_2 in crosslinks:
 
+                        # get the last nuid in the chain, which is a list of 2-tuples
                         chain_end = chain[-1][1]
 
                         found_connection = False
@@ -1212,6 +1213,8 @@ class NatureGuideCrosslinks(models.Model):
             
             all_crosslinks.append(crosslink_tuple)
 
+        print('Checking crosslinks for circularity:')
+        print(all_crosslinks)
         crosslink_manager =  CrosslinkManager()
         is_circular = crosslink_manager.check_circularity(all_crosslinks)
 

app_kit/features/nature_guides/templates/nature_guides/ajax/manage_matrix_filter.html

@@ -10,15 +10,22 @@
 {% endblock %}
 
 {% block body %}
-	<p>
-		<div>
-			{% render_bootstrap_form form %}
-		</div>
-	</p>
-	{% if success is True %}
-		<div class="alert alert-success">
-			{% trans 'Successfully saved matrix filter.' %}
+
+	{% if adding_allowed == False and not matrix_filter %}
+		<div class="alert alert-warning">
+			{% trans "In dichotomous or polytomous identification mode, only one matrix filter is allowed." %}
 		</div>
+	{% else %}
+		<p>
+			<div>
+				{% render_bootstrap_form form %}
+			</div>
+		</p>
+		{% if success is True %}
+			<div class="alert alert-success">
+				{% trans 'Successfully saved matrix filter.' %}
+			</div>
+		{% endif %}
 	{% endif %}
 {% endblock %}
 

app_kit/features/nature_guides/views.py

@@ -819,6 +819,14 @@ class ManageMatrixFilter(FormLanguageMixin, MetaAppMixin, FormView):
         context['meta_node'] = self.meta_node
         context['filter_type'] = self.filter_type
         context['matrix_filter'] = self.matrix_filter
+        
+        adding_allowed = True
+        if self.meta_node.identification_mode == IDENTIFICATION_MODE_POLYTOMOUS:
+            existing_filters_count = MatrixFilter.objects.filter(meta_node=self.meta_node).count()
+            if existing_filters_count >= 1:
+                adding_allowed = False
+                
+        context['adding_allowed'] = adding_allowed
 
         # fallback
         verbose_filter_name = self.filter_type

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/delete_all_manually_added_images.html

@@ -0,0 +1,37 @@
+{% extends "localcosmos_server/modals/modal_form.html" %}
+{% load i18n %}
+
+{% block title %}
+    {% trans 'Delete All Manually Added Images' %}
+{% endblock %}
+
+
+{% block action %}
+    {% url 'delete_all_manually_added_taxon_profile_images' meta_app.id taxon_profiles.id %}
+{% endblock %}
+
+{% block body %}
+    <p>
+        {% if success %}
+            <div class="alert alert-success">
+                {% trans 'All manually added images have been successfully deleted.' %}
+            </div>
+        {% else %}
+            <div class="alert alert-danger">
+                {% trans 'Are you sure you want to delete all manually added images across all taxon profiles? This action cannot be undone.' %}
+            </div>
+        {% endif %}
+    </p>
+{% endblock %}
+
+{% block footer %}
+    {% if success %}
+        {% include 'localcosmos_server/modals/footers/close.html' %}
+    {% else %}
+    	{% include 'localcosmos_server/modals/footers/delete.html' %}
+    {% endif %}
+{% endblock %}
+
+{% block script %}
+
+{% endblock %}

app_kit/features/taxon_profiles/templates/taxon_profiles/ajax/manage_taxon_profile_form.html

@@ -63,7 +63,7 @@
 			{% endif %}
 		{% endfor %}
 		{% if form.has_categories %}
-			</div>
+			<!--</div>-->
 		{% endif %}
 	</div>
 

app_kit/features/taxon_profiles/templates/taxon_profiles/manage_taxon_profiles.html

@@ -168,6 +168,22 @@
 			</div>
 		</div>
 	</div>
+
+	<div class="mt-5">
+		<h3 class="text-danger">
+			{% trans 'Danger Zone' %}
+		</h3>
+	</div>
+	<div class="card mt-3">
+		<div class="card-body">
+			<div>
+				<button type="button" class="btn btn-outline-danger xhr" ajax-target="ModalContent" data-url="{% url 'delete_all_manually_added_taxon_profile_images' meta_app.id generic_content.id %}">{% trans 'Delete all Taxon Profile images that have been added manually' %}</button>
+			</div>
+			<div class="mt-3">
+				{% trans 'This will delete all manually added images across all taxon profiles.' %}
+			</div>
+		</div>
+	</div>
 {% endblock %}
 
 {% block extra_script %}

app_kit/features/taxon_profiles/tests/test_views.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 
 from app_kit.tests.common import test_settings
 
-from app_kit.models import MetaAppGenericContent, ContentImage
+from app_kit.models import MetaAppGenericContent, ContentImage, MetaApp
 
 from app_kit.tests.mixins import (WithMetaApp, WithTenantClient, WithUser, WithLoggedInUser, WithAjaxAdminOnly,
                                   WithAdminOnly, ViewTestMixin, WithImageStore, WithMedia, WithFormTest)
@@ -20,7 +20,8 @@ from app_kit.features.taxon_profiles.views import (ManageTaxonProfiles, ManageTa
                 DeleteTaxonProfilesNavigationEntry, GetTaxonProfilesNavigation, ManageNavigationImage,
                 DeleteNavigationImage, DeleteTaxonProfilesNavigationEntryTaxon, DeleteTaxonTextTypeCategory,
                 ChangeNavigationEntryPublicationStatus, ManageTaxonTextTypeCategory, ManageTaxonTextSet,
-                DeleteTaxonTextSet, GetTaxonTextsManagement, SetTaxonTextSetForTaxonProfile)
+                DeleteTaxonTextSet, GetTaxonTextsManagement, SetTaxonTextSetForTaxonProfile,
+                DeleteAllManuallyAddedTaxonProfileImages)
 
 from app_kit.features.taxon_profiles.models import (TaxonProfiles, TaxonProfile, TaxonTextType,
                 TaxonText, TaxonProfilesNavigation, TaxonProfilesNavigationEntry,
@@ -2590,4 +2591,100 @@ class TestSetTaxonTextSetForTaxonProfile(WithTaxonProfile, WithTaxonProfiles, Vi
         
         self.taxon_profile.refresh_from_db()
         
-        self.assertEqual(self.taxon_profile.taxon_text_set, text_set)
+        self.assertEqual(self.taxon_profile.taxon_text_set, text_set)
+
+
+class TestDeleteAllManuallyAddedTaxonProfileImages(WithTaxonProfile, WithTaxonProfiles, ViewTestMixin,
+                WithImageStore, WithMedia, WithAjaxAdminOnly, WithUser, WithLoggedInUser, WithMetaApp, WithTenantClient, TenantTestCase):
+    
+    url_name = 'delete_all_manually_added_taxon_profile_images'
+    view_class = DeleteAllManuallyAddedTaxonProfileImages
+    
+    def get_url_kwargs(self):
+        url_kwargs = {
+            'meta_app_id': self.meta_app.id,
+            'taxon_profiles_id': self.generic_content.id,
+        }
+        return url_kwargs
+    
+    def create_content_images(self):
+
+        # taxon image
+        self.taxon_image_store = self.create_image_store()
+
+        # add image to nature guide meta node
+        self.meta_node_image = self.create_content_image(self.meta_app, self.user)
+
+        # add image to taxon profile
+        self.taxon_profile_image = self.create_content_image(self.taxon_profile, self.user)
+        
+
+    
+    @test_settings
+    def test_set_taxon_profiles(self):
+        
+        view = self.get_view()
+        view.meta_app = self.meta_app
+        view.set_taxon_profiles(**view.kwargs)
+        
+        self.assertEqual(view.taxon_profiles, self.generic_content)
+        
+    @test_settings
+    def test_get_context_data(self):
+        
+        view = self.get_view()
+        view.meta_app = self.meta_app
+        view.set_taxon_profiles(**view.kwargs)
+        
+        context = view.get_context_data(**view.kwargs)
+        
+        self.assertEqual(context['taxon_profiles'], self.generic_content)
+        self.assertFalse(context['success'])
+        
+    @test_settings
+    def test_post(self):
+        
+        view = self.get_view()
+        view.meta_app = self.meta_app
+        view.set_taxon_profiles(**view.kwargs)
+        
+        self.create_content_images()
+        
+        taxon_profile_ctype = ContentType.objects.get_for_model(TaxonProfile)
+        meta_app_ctype = ContentType.objects.get_for_model(MetaApp)
+        
+        # verify image exists
+        images_qry = ContentImage.objects.filter(
+            content_type=taxon_profile_ctype,
+            object_id=self.taxon_profile.id,
+        )
+        self.assertTrue(images_qry.exists())
+        
+        meta_app_images_qry = ContentImage.objects.filter(
+            content_type=meta_app_ctype,
+            object_id=self.meta_app.id,
+        )
+        
+        self.assertTrue(meta_app_images_qry.exists())
+        
+        # perform post to delete images
+        response = view.post(view.request, **view.kwargs)
+        
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(response.context_data['success'])
+        
+        # verify images deleted
+        images_qry = ContentImage.objects.filter(
+            content_type=taxon_profile_ctype,
+            object_id=self.taxon_profile.id,
+        )
+        self.assertFalse(images_qry.exists())
+        
+        # verify meta app image still exists
+        meta_app_images_qry = ContentImage.objects.filter(
+            content_type=meta_app_ctype,
+            object_id=self.meta_app.id,
+        )
+        self.assertTrue(meta_app_images_qry.exists())
+        
+        

app_kit/features/taxon_profiles/urls.py

@@ -119,4 +119,7 @@ urlpatterns = [
      # move images
      path('move-taxon-profile-image-to-section/<int:meta_app_id>/<int:taxon_profile_id>/<int:content_image_id>/',
            views.MoveImageToSection.as_view(), name='move_taxon_profile_image_to_section'),
+     # delete all manually added images
+     path('delete-all-manually-added-taxon-profile-images/<int:meta_app_id>/<int:taxon_profiles_id>/',
+           views.DeleteAllManuallyAddedTaxonProfileImages.as_view(), name='delete_all_manually_added_taxon_profile_images'),
 ]

app_kit/features/taxon_profiles/views.py

@@ -1580,4 +1580,41 @@ class MoveImageToSection(MetaAppMixin, FormView):
         context['success'] = True
 
         return self.render_to_response(context)
-    
+    
+    
+class DeleteAllManuallyAddedTaxonProfileImages(MetaAppMixin, TemplateView):
+    
+    template_name = 'taxon_profiles/ajax/delete_all_manually_added_images.html'
+    
+    @method_decorator(ajax_required)
+    def dispatch(self, request, *args, **kwargs):
+        self.set_taxon_profiles(**kwargs)
+        return super().dispatch(request, *args, **kwargs)
+    
+    def set_taxon_profiles(self, **kwargs):
+        self.taxon_profiles = TaxonProfiles.objects.get(pk=kwargs['taxon_profiles_id'])
+        
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['taxon_profiles'] = self.taxon_profiles
+        context['success'] = False
+        return context
+    
+    def post(self, request, *args, **kwargs):
+        
+        taxon_profile_ctype = ContentType.objects.get_for_model(TaxonProfile)
+        all_taxon_profiles = TaxonProfile.objects.filter(taxon_profiles=self.taxon_profiles)
+        
+        images_to_delete = ContentImage.objects.filter(
+            content_type=taxon_profile_ctype,
+            object_id__in=all_taxon_profiles.values_list('id', flat=True)
+        )
+        
+        deleted_count = images_to_delete.count()
+        images_to_delete.delete()
+        
+        context = self.get_context_data(**self.kwargs)
+        context['deleted_count'] = deleted_count
+        context['success'] = True
+        
+        return self.render_to_response(context)

app_kit/features/taxon_profiles/zip_import.py

@@ -260,6 +260,7 @@ class TaxonProfilesZipImporter(GenericContentZipImporter):
 
 
     def validate_external_media(self, url, col_letter, row_index):
+        
         validator = URLValidator()
         
         is_valid = True
@@ -566,6 +567,9 @@ class TaxonProfilesZipImporter(GenericContentZipImporter):
                             elif column_type == ColumnType.EXTERNAL_MEDIA.value:
                                 
                                 external_media_url = cell_value
+                                
+                                if not external_media_url:
+                                    continue
 
                                 external_media_data = self.get_external_media_data_from_external_media_sheet(external_media_url)
 

app_kit/forms.py

@@ -18,6 +18,8 @@ from app_kit.appbuilder.AppBuilderBase import AppBuilderBase
 from taxonomy.models import MetaVernacularNames
 from taxonomy.lazy import LazyTaxon
 
+from content_licencing.mixins import LicencingFormMixin
+
 import base64, math, uuid
 
 from .definitions import TEXT_LENGTH_RESTRICTIONS
@@ -130,7 +132,13 @@ class AddLanguageForm(forms.Form):
 '''
 from localcosmos_server.forms import (ManageContentImageForm, ManageContentImageWithTextForm,
     ManageLocalizedContentImageForm, OptionalContentImageForm)
+
+class ManageContentLicenceForm(LicencingFormMixin):
+    content_field = None
     
+    def __init__(self, content_field, *args, **kwargs):
+        self.content_field = content_field
+        super().__init__(*args, **kwargs)
 
 class GenericContentOptionsForm(forms.Form):