Merge pull request #1561 from nextcloud/bugfix/noid/mark-bundled-apps…

…-as-shipped fix: Show a note for bundled apps
nextcloud · Jan 8, 2025 · c7d8fd9 · c7d8fd9
2 parents a83ab93 + 52fdfef
commit c7d8fd9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/nextcloudappstore/core/models.py b/nextcloudappstore/core/models.py
@@ -320,14 +320,12 @@ def compatible_unstable_releases(self, platform_version, inclusive=True):
             reverse=True,
         )
 
-    def is_outdated(self):
-        """Checks if an app has been released in last 3 recent platform versions
+    def is_server_bundled(self):
+        """Checks if an app bundled with the Nextcloud Server
 
-        :return: True if not compatible, otherwise false
+        :return: True if bundled, otherwise false
         """
 
-        if self.is_integration:
-            return False
         if self.id in [
             "activity",
             "admin_audit",
@@ -383,6 +381,18 @@ def is_outdated(self):
             "webhook_listeners",
             "workflowengine",
         ]:
+            return True
+        return False
+
+    def is_outdated(self):
+        """Checks if an app has been released in last 3 recent platform versions
+
+        :return: True if not compatible, otherwise false
+        """
+
+        if self.is_integration:
+            return False
+        if self.is_server_bundled():
             return False
         release_versions = list(self.latest_releases_by_platform_v().keys())
         if not release_versions:

diff --git a/nextcloudappstore/core/templates/app/detail.html b/nextcloudappstore/core/templates/app/detail.html
@@ -39,7 +39,14 @@
             </div>
         </section>
     {% endif %}
-    {% if object.is_outdated %}
+    {% if object.is_server_bundled %}
+        <div class="alert alert-info" role="alert">
+            <strong>
+                {% trans "This app has become part of the Nextcloud Server release packages." %}
+            </strong>
+            {% trans "It is no longer actively distributed via the app store, but when updating the Nextcloud Server the app will be updated to the latest version automatically." %}
+        </div>
+    {% elif object.is_outdated %}
         <div class="alert alert-warning" role="alert">
             <strong>
                 {% trans "This app hasn’t been tested with the latest 3 major releases of Nextcloud." %}