Merge pull request #58 from arthur-schnitzler/main

updates
acdh-oeaw · Jan 29, 2024 · a70753d · a70753d
2 parents 142d200 + 29dec22
commit a70753d
Show file tree

Hide file tree

Showing 7 changed files with 258 additions and 257 deletions.
diff --git a/apis_core/apis_relations/autocomplete_light_registry.py b/apis_core/apis_relations/autocomplete_light_registry.py
diff --git a/apis_core/apis_relations/forms2.py b/apis_core/apis_relations/forms2.py
@@ -15,15 +15,12 @@
 from apis_core.apis_entities.fields import ListSelect2
 from apis_core.apis_entities.models import AbstractEntity
 
-# from dal.autocomplete import ListSelect2
 from apis_core.apis_metainfo.models import TempEntityClass, Uri
 from apis_core.apis_relations.models import AbstractRelation
 from apis_core.helper_functions import DateParser
 
 from .tables import get_generic_relations_table
 
-# from dal.autocomplete import ListSelect2
-
 
 def validate_target_autocomplete(value):
     try:
@@ -130,7 +127,7 @@ def __init__(self, siteID=None, highlighter=False, *args, **kwargs):
         """
         attrs = {
             "data-placeholder": "Type to get suggestions",
-            "data-minimum-input-length": getattr(settings, "APIS_MIN_CHAR", 3),
+            "data-minimum-input-length": 0,
             "data-html": True,
             "style": "width: 100%",
         }
@@ -262,7 +259,6 @@ def __init__(self, siteID=None, highlighter=False, *args, **kwargs):
             self.fields["relation_type"] = autocomplete.Select2ListCreateChoiceField(
                 label="Relation type",
                 widget=ListSelect2(
-                    # url='/vocabularies/autocomplete/{}{}relation/reverse'.format(lst_src_target[0].lower(), lst_src_target[1].lower()),
                     url=reverse(
                         "apis:apis_vocabularies:generic_vocabularies_autocomplete",
                         args=[
@@ -282,7 +278,6 @@ def __init__(self, siteID=None, highlighter=False, *args, **kwargs):
             self.fields["target"] = autocomplete.Select2ListCreateChoiceField(
                 label=lst_src_target[0],
                 widget=ListSelect2(
-                    # url='/entities/autocomplete/{}'.format(lst_src_target[0].lower()),
                     url=reverse(
                         "apis:apis_entities:generic_entities_autocomplete",
                         args=[lst_src_target[0].lower()],

diff --git a/apis_core/apis_relations/models.py b/apis_core/apis_relations/models.py
@@ -22,6 +22,7 @@ class AbstractRelation(TempEntityClass):
     class Meta:
         abstract = True
         default_manager_name = "objects"
+        ordering = ["start_date", "id"]
 
     def save(self, *args, **kwargs):
         if (

diff --git a/apis_core/apis_vocabularies/admin.py b/apis_core/apis_vocabularies/admin.py
@@ -33,7 +33,7 @@ def save_model(self, request, obj, form, change):
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         attrs = {
             "data-placeholder": "Type to get suggestions",
-            "data-minimum-input-length": getattr(settings, "APIS_MIN_CHAR", 3),
+            "data-minimum-input-length": 0,
             "data-html": True,
         }
         c_name = db_field.model.__name__