[PATCH gwspamd 1/2] gwspamd: web: Add direct link for activity log

[PATCH gwspamd 1/2] gwspamd: web: Add direct link for activity log

[Memet Zx]

Added a direct link from the log section on home to audit_log

Signed-off-by: Memet Zx <zxce3@gnuweeb.org>
---
 web/views/pages/audit_log.php | 6 +++---
 web/views/pages/home.php      | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/views/pages/audit_log.php b/web/views/pages/audit_log.php
index a330d45..9b20093 100644
--- a/web/views/pages/audit_log.php
+++ b/web/views/pages/audit_log.php
@@ -42,9 +42,9 @@ $paginator = ob_get_clean();
 	</style>
 	<ol class="activity-feed">
 		<?php foreach ($st->fetchAll() as $row) : ?>
-			<li class="feed-item">
+			<li id="log-<?= e($row["id"]); ?>" class="feed-item">
 				<time class="date" datetime="<?= e($row["created_at"]); ?>"><?= e($row["created_at"]); ?></time>
-				<span class="text"><?= e($row["action"]); ?></span>
+				<span class="text">[<?= e($row["id"]); ?>] <?= e($row["action"]); ?></span>
 				<br>
 				<span class="text">
 					<?= build_extra_data($row["action"], $row["extra"]); ?>
@@ -53,4 +53,4 @@ $paginator = ob_get_clean();
 		<?php endforeach; ?>
 	</ol>
 	<?= $paginator; ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/web/views/pages/home.php b/web/views/pages/home.php
index b0d9824..9214cce 100644
--- a/web/views/pages/home.php
+++ b/web/views/pages/home.php
@@ -129,9 +129,8 @@ ob_start();
                 <table class="table">
                     <?php foreach ($st->fetchAll() as $row) : ?>
                         <tr>
-                            <td><?= e($row["id"]); ?></td>
+                            <td><a href="audit_log.php#log-<?= e($row["id"]); ?>">#<?= e($row["id"]); ?></a></td>
                             <td><?= e($row["action"]); ?></td>
-                            <!-- <td align="left"><?= build_extra_data($row["action"], $row["extra"]); ?></td> -->
                             <td><?= e($row["created_at"]); ?></td>
                         </tr>
                     <?php endforeach; ?>
@@ -141,4 +140,4 @@ ob_start();
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

base-commit: 0039077f1e350a267a5c313d46b94a8545502f9b
-- 
Memet Zx

[PATCH gwspamd 2/2] gwspamd: web: Add *.patch and *.diff to .gitignore

[Memet Zx]

Avoid patch and diff file being committed.

Signed-off-by: Memet Zx <zxce3@gnuweeb.org>
---
 web/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/.gitignore b/web/.gitignore
index 233aef8..6531cf5 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -1,2 +1,4 @@
 /config.php
 /gwspamd.sql.gz
+*.patch
+*.diff
-- 
Memet Zx

Re: [PATCH gwspamd 1/2] gwspamd: web: Add direct link for activity log

[Ammar Faizi]

On Thu, Apr 27, 2023 at 05:47:40PM +0700, Memet Zx wrote:
> Added a direct link from the log section on home to audit_log

Use verb 1 for the commit message.

>  web/views/pages/audit_log.php | 6 +++---
>  web/views/pages/home.php      | 5 ++---
>  2 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/web/views/pages/audit_log.php b/web/views/pages/audit_log.php
[...]
> -</div>
> +</div>
> \ No newline at end of file

Add a newline at end of file.

> diff --git a/web/views/pages/home.php b/web/views/pages/home.php
[...]
> -</div>
> +</div>
> \ No newline at end of file

Add a newline at end of file.

-- 
Ammar Faizi

[PATCH 1/2] gwspamd: web: Add direct link for activity log

[Memet Zx]

Added a direct link from the log section on home to audit_log

Signed-off-by: Memet Zx <zxce3@gnuweeb.org>
---
 web/views/pages/audit_log.php | 4 ++--
 web/views/pages/home.php      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/views/pages/audit_log.php b/web/views/pages/audit_log.php
index a330d45..b346969 100644
--- a/web/views/pages/audit_log.php
+++ b/web/views/pages/audit_log.php
@@ -42,9 +42,9 @@ $paginator = ob_get_clean();
 	</style>
 	<ol class="activity-feed">
 		<?php foreach ($st->fetchAll() as $row) : ?>
-			<li class="feed-item">
+			<li id="log-<?= e($row["id"]); ?>" class="feed-item">
 				<time class="date" datetime="<?= e($row["created_at"]); ?>"><?= e($row["created_at"]); ?></time>
-				<span class="text"><?= e($row["action"]); ?></span>
+				<span class="text">[<?= e($row["id"]); ?>] <?= e($row["action"]); ?></span>
 				<br>
 				<span class="text">
 					<?= build_extra_data($row["action"], $row["extra"]); ?>
diff --git a/web/views/pages/home.php b/web/views/pages/home.php
index b0d9824..2d0b671 100644
--- a/web/views/pages/home.php
+++ b/web/views/pages/home.php
@@ -129,9 +129,8 @@ ob_start();
                 <table class="table">
                     <?php foreach ($st->fetchAll() as $row) : ?>
                         <tr>
-                            <td><?= e($row["id"]); ?></td>
+                            <td><a href="audit_log.php#log-<?= e($row["id"]); ?>">#<?= e($row["id"]); ?></a></td>
                             <td><?= e($row["action"]); ?></td>
-                            <!-- <td align="left"><?= build_extra_data($row["action"], $row["extra"]); ?></td> -->
                             <td><?= e($row["created_at"]); ?></td>
                         </tr>
                     <?php endforeach; ?>
-- 
2.34.1

Re: [PATCH 1/2] gwspamd: web: Add direct link for activity log

[Ammar Faizi]

On Thu, Apr 27, 2023 at 06:30:19PM +0700, Memet Zx wrote:
> Added a direct link from the log section on home to audit_log

Use verb 1 for the commit message. Also, please add -v2 when you send a
revision, plus the changelog diff between previous and the current
version. When you send more than 1 patch, use a cover letter.

-- 
Ammar Faizi