From 263556a6dad5ccb3f790d34b74f0e5c4aec89f5c Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Tue, 23 Apr 2024 20:11:15 +0200
Subject: [PATCH] appgenerator: misc fixes (#2254)

* appgenerator: docs -> doc

* appgenerator: remove stuff related to DISCLAIMER.md which is not used in packaging v2 anymore
---
 tools/app_generator/app.py                  | 25 +++++----------------
 tools/app_generator/templates/DISCLAIMER.j2 |  1 -
 tools/app_generator/templates/index.html    |  1 -
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 tools/app_generator/templates/DISCLAIMER.j2

diff --git a/tools/app_generator/app.py b/tools/app_generator/app.py
index d3fb9c9..a4a204f 100644
--- a/tools/app_generator/app.py
+++ b/tools/app_generator/app.py
@@ -539,16 +539,6 @@ Do not give the software name at the beginning, as it will be integrated an 'Ove
             "spellcheck": "false",
         },
     )
-    disclaimer = TextAreaField(
-        lazy_gettext(
-            "Type the DISCLAIMER.md file content, which list warnings and attention points."
-        ),
-        validators=[Optional()],
-        render_kw={
-            "class": "form-control",
-            "spellcheck": "false",
-        },
-    )
     pre_install = TextAreaField(
         lazy_gettext("Type the PRE_INSTALL.md file content"),
         validators=[Optional()],
@@ -751,25 +741,22 @@ def main_form_route():
         # app_files.append(AppFile("php", "conf/extra_php-fpm.conf"))
 
         if main_form.description.data:
-            app_files.append(AppFile("DESCRIPTION", "docs/DESCRIPTION.md"))
-
-        if main_form.disclaimer.data:
-            app_files.append(AppFile("DISCLAIMER", "docs/DISCLAIMER.md"))
+            app_files.append(AppFile("DESCRIPTION", "doc/DESCRIPTION.md"))
 
         if main_form.pre_install.data:
-            app_files.append(AppFile("PRE_INSTALL", "docs/PRE_INSTALL.md"))
+            app_files.append(AppFile("PRE_INSTALL", "doc/PRE_INSTALL.md"))
 
         if main_form.post_install.data:
-            app_files.append(AppFile("POST_INSTALL", "docs/POST_INSTALL.md"))
+            app_files.append(AppFile("POST_INSTALL", "doc/POST_INSTALL.md"))
 
         if main_form.pre_upgrade.data:
-            app_files.append(AppFile("PRE_UPGRADE", "docs/PRE_UPGRADE.md"))
+            app_files.append(AppFile("PRE_UPGRADE", "doc/PRE_UPGRADE.md"))
 
         if main_form.post_upgrade.data:
-            app_files.append(AppFile("POST_UPGRADE", "docs/POST_UPGRADE.md"))
+            app_files.append(AppFile("POST_UPGRADE", "doc/POST_UPGRADE.md"))
 
         if main_form.admin.data:
-            app_files.append(AppFile("ADMIN", "docs/ADMIN.md"))
+            app_files.append(AppFile("ADMIN", "doc/ADMIN.md"))
 
         template_dir = os.path.dirname(__file__) + "/templates/"
         for app_file in app_files:
diff --git a/tools/app_generator/templates/DISCLAIMER.j2 b/tools/app_generator/templates/DISCLAIMER.j2
deleted file mode 100644
index a46cd0b..0000000
--- a/tools/app_generator/templates/DISCLAIMER.j2
+++ /dev/null
@@ -1 +0,0 @@
-This is a dummy disclaimer that will be added to the README.MD of your app.
diff --git a/tools/app_generator/templates/index.html b/tools/app_generator/templates/index.html
index 13f53d1..c1d74c8 100644
--- a/tools/app_generator/templates/index.html
+++ b/tools/app_generator/templates/index.html
@@ -252,7 +252,6 @@ YunoHost app generator
       <div class="panel-body collapsible collapsed">
           <p><i>{{ gettext("A more complete presentation that the summary completed above, explaining to what correspond the software, the eventual warnings and specific details on its functioning in Yunohost (it's the place where one can warn about integration issues).") }}</i></p>
           {{ form_field(main_form.description) }}
-          {{ form_field(main_form.disclaimer) }}
 
           <p><i>{{ gettext("Indications to show at key steps to manage the package : installation, update, message to the admin account. You usually don't have to fill them.") }}</i></p>
           {{ form_field(main_form.pre_install) }}