From 8087e46da4084548c2fa55b604946dae9aabe1bb Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 18 Jan 2024 10:54:18 +0100
Subject: [PATCH 1/2] fix: [repo] Point to the correct ail-project repo

---
 other_installers/ansible/roles/ail-host/tasks/main.yml | 2 +-
 other_installers/docker/README.md                      | 2 +-
 var/www/modules/settings/templates/settings_index.html | 4 ++--
 var/www/templates/settings/settings_index.html         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/other_installers/ansible/roles/ail-host/tasks/main.yml b/other_installers/ansible/roles/ail-host/tasks/main.yml
index af520fe4..47ada451 100644
--- a/other_installers/ansible/roles/ail-host/tasks/main.yml
+++ b/other_installers/ansible/roles/ail-host/tasks/main.yml
@@ -64,7 +64,7 @@
 
 - name: Clone the AIL repository
   git:
-    repo: 'https://github.com/CIRCL/AIL-framework.git'
+    repo: 'https://github.com/ail-project/AIL-framework.git'
     dest: /opt/AIL-framework
     update: yes
 
diff --git a/other_installers/docker/README.md b/other_installers/docker/README.md
index 070f791c..c931bb65 100644
--- a/other_installers/docker/README.md
+++ b/other_installers/docker/README.md
@@ -15,7 +15,7 @@ curl https://get.docker.com | /bin/bash
 
 2. Type these commands to build the Docker image:
 ```bash
-git clone https://github.com/CIRCL/AIL-framework.git
+git clone https://github.com/ail-project/AIL-framework.git
 cd AIL-framework
 cp -r ./other_installers/docker/Dockerfile ./other_installers/docker/docker_start.sh ./other_installers/docker/pystemon ./
 cp ./configs/update.cfg.sample ./configs/update.cfg
diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html
index fd608a64..b6a3fdf7 100644
--- a/var/www/modules/settings/templates/settings_index.html
+++ b/var/www/modules/settings/templates/settings_index.html
@@ -121,7 +121,7 @@
             <h4 class="alert-heading">New Version Available!</h4>
             <hr class="my-0">
             <p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p>
-            <a target="_blank" href="https://github.com/CIRCL/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
+            <a target="_blank" href="https://github.com/ail-project/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
           </div>
         {%endif%}
 
@@ -130,7 +130,7 @@
             <h4 class="alert-heading">New Update Available!</h4>
             <hr class="my-0">
             <p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p>
-            <a target="_blank" href="https://github.com/CIRCL/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
+            <a target="_blank" href="https://github.com/ail-project/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
           </div>
         {%endif%}
 
diff --git a/var/www/templates/settings/settings_index.html b/var/www/templates/settings/settings_index.html
index 59d3fed5..dbdd6843 100644
--- a/var/www/templates/settings/settings_index.html
+++ b/var/www/templates/settings/settings_index.html
@@ -121,7 +121,7 @@
             <h4 class="alert-heading">New Version Available!</h4>
             <hr class="my-0">
             <p>A new version is available, new version: <strong>{{git_metadata['last_remote_tag']}}</strong></p>
-            <a target="_blank" href="https://github.com/CIRCL/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
+            <a target="_blank" href="https://github.com/ail-project/AIL-framework/releases/tag/{{git_metadata['last_remote_tag']}}"> Check last release note.</a>
           </div>
         {%endif%}
 
@@ -130,7 +130,7 @@
             <h4 class="alert-heading">New Update Available!</h4>
             <hr class="my-0">
             <p>A new update is available, new commit ID: <strong>{{git_metadata['last_remote_commit']}}</strong></p>
-            <a target="_blank" href="https://github.com/CIRCL/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
+            <a target="_blank" href="https://github.com/ail-project/AIL-framework/commit/{{git_metadata['last_remote_commit']}}"> Check last commit content.</a>
           </div>
         {%endif%}
 

From 0449cc8d25faf8bcf52fdfc2b1907db07a0db76b Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 18 Jan 2024 11:19:40 +0100
Subject: [PATCH 2/2] chg: [UI] If version None do not show release note link

---
 var/www/modules/settings/templates/settings_index.html | 2 ++
 var/www/templates/settings/settings_index.html         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/var/www/modules/settings/templates/settings_index.html b/var/www/modules/settings/templates/settings_index.html
index b6a3fdf7..2db88d81 100644
--- a/var/www/modules/settings/templates/settings_index.html
+++ b/var/www/modules/settings/templates/settings_index.html
@@ -43,7 +43,9 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version != 'None'%}
                           <td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}
diff --git a/var/www/templates/settings/settings_index.html b/var/www/templates/settings/settings_index.html
index dbdd6843..2c6ef418 100644
--- a/var/www/templates/settings/settings_index.html
+++ b/var/www/templates/settings/settings_index.html
@@ -43,7 +43,9 @@
                       <tbody>
                         <tr>
                           <td>AIL Version</td>
+                          {%if ail_version != 'None'%}
                           <td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td>
+                          {%endif%}
                         </tr>
                         <tr
                         {%if git_metadata['current_branch'] != 'master'%}