Merge branch 'stable'

WeblateOrg · Nov 12, 2024 · c74ca55 · c74ca55
2 parents 31df238 + 758e99e
commit c74ca55
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -30,6 +30,10 @@ Weblate 5.8.4
 
 Not yet released.
 
+**Improvements**
+
+* :ref:`search-users` can search based on user changes.
+
 **Bug fixes**
 
 * Fixed occasional crash in :ref:`rss`.

diff --git a/docs/user/search.rst b/docs/user/search.rst
@@ -3,6 +3,8 @@
 Searching
 =========
 
+.. _search-strings:
+
 Searching for strings
 +++++++++++++++++++++
 
@@ -178,6 +180,7 @@ There are many options to order the strings according to your needs:
 
 .. image:: /screenshots/query-sort.webp
 
+.. _search-users:
 
 Searching for users
 +++++++++++++++++++
@@ -198,6 +201,10 @@ The user browsing has similar search abilities:
    User has contributed to a given language in the past 90 days.
 ``contributes:TEXT``
    User has contributed to a given project or component in the past 90 days.
+``change_time:DATETIME``
+   Same as in :ref:`search-strings`.
+``change_action:TEXT``
+   Same as in :ref:`search-strings`.
 
 Additional lookups are available in the :ref:`management-interface`:
 

diff --git a/weblate/templates/snippets/info.html b/weblate/templates/snippets/info.html
@@ -470,7 +470,7 @@ <h4 class="panel-title">{% trans "Trends of last 30 days" %}</h4>
           </div>
           <div class="col-sm-3">
             <div class="metric">
-              <a href="{% url "user_list" %}?q={% if language %}translates:{{ language.code|urlencode }}{% elif translation %}translates:{{ translation.language.code|urlencode }}{% endif %} {% if component %}contributes:{{ component.full_slug|urlencode }}{% elif project %}contributes:{{ project.slug|urlencode }}{% endif %}">
+              <a href="{% url "user_list" %}?q={% if language %}translates:{{ language.code|urlencode }}{% elif translation %}translates:{{ translation.language.code|urlencode }}{% endif %} {% if component %}contributes:{{ component.full_slug|urlencode }}{% elif project %}contributes:{{ project.slug|urlencode }}{% endif %} change_time:&gt;'30 days ago' ">
                 <div class="metric-number">{{ metrics.contributors|number_format }}</div>
                 <div class="metric-text">{% trans "Contributors" %}</div>
               </a>

diff --git a/weblate/utils/search.py b/weblate/utils/search.py
@@ -297,6 +297,9 @@ def convert_change_action(self, text: str) -> int:
         except KeyError:
             return Change.ACTION_STRINGS[text]
 
+    def convert_change_time(self, text: str) -> datetime | tuple[datetime, datetime]:
+        return self.convert_datetime(text)
+
     def field_name(self, field: str, suffix: str | None = None) -> str:
         if suffix is None:
             suffix = OPERATOR_MAP[self.operator]
@@ -541,9 +544,6 @@ def path_field(self, text: str, context: dict) -> Q:
         msg = f"Unsupported path lookup: {obj}"
         raise TypeError(msg)
 
-    def convert_change_time(self, text: str) -> datetime | tuple[datetime, datetime]:
-        return self.convert_datetime(text)
-
     def convert_changed(self, text: str) -> datetime | tuple[datetime, datetime]:
         return self.convert_datetime(text)
 
@@ -596,6 +596,8 @@ class UserTermExpr(BaseTermExpr):
     PLAIN_FIELDS: set[str] = {"username", "full_name"}
     NONTEXT_FIELDS: dict[str, str] = {
         "joined": "date_joined",
+        "change_time": "change__timestamp",
+        "change_action": "change__action",
     }
     EXACT_FIELD_MAP: dict[str, str] = {
         "language": "profile__languages__code",