From 9fb32c46991d1f132b72fa50ffbe16efcf390a84 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 12 Jul 2019 18:29:58 +0200
Subject: [PATCH] Deployment area single targets
---
.../godmode/groups/credential_store.php | 2 +-
pandora_console/godmode/wizards/Wizard.main.php | 2 +-
.../include/functions_credential_store.php | 2 --
pandora_console/include/styles/deployment_list.css | 14 +++++++++++++-
pandora_console/include/styles/tables.css | 6 ++++++
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pandora_console/godmode/groups/credential_store.php b/pandora_console/godmode/groups/credential_store.php
index 9334cd6065..dd7cc5affb 100644
--- a/pandora_console/godmode/groups/credential_store.php
+++ b/pandora_console/godmode/groups/credential_store.php
@@ -369,7 +369,7 @@ echo '</div>';
text = err.message;
failed = 1;
}
- if (!failed && data['error']) {
+ if (!failed && data['error'] != undefined) {
title = "<?php echo __('Failed'); ?>";
text = data['error'];
failed = 1;
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index 8f0bb0bbd8..3292a88ef6 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -592,7 +592,7 @@ class Wizard
$cb_function = $data['cb_function'];
$cb_args = $data['cb_args'];
- $output_head = '<form class="discovery" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+ $output_head = '<form id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
$output_head .= '" '.$form['extra'].'>';
if ($return === false) {
diff --git a/pandora_console/include/functions_credential_store.php b/pandora_console/include/functions_credential_store.php
index ea7b3d5c72..048c2bba00 100644
--- a/pandora_console/include/functions_credential_store.php
+++ b/pandora_console/include/functions_credential_store.php
@@ -56,8 +56,6 @@ function credentials_get_all(
global $config;
- $user_is_admin = users_is_admin();
-
if (!is_array($filter)) {
error_log('[credential_get_all] Filter must be an array.');
throw new Exception('[credential_get_all] Filter must be an array.');
diff --git a/pandora_console/include/styles/deployment_list.css b/pandora_console/include/styles/deployment_list.css
index ca5385f3f5..c107342246 100644
--- a/pandora_console/include/styles/deployment_list.css
+++ b/pandora_console/include/styles/deployment_list.css
@@ -2,7 +2,7 @@ ul.wizard li > label:not(.p-switch) {
width: auto;
}
-ul.wizard {
+form.top-action-buttons ul.wizard {
display: flex;
flex-direction: row;
}
@@ -10,3 +10,15 @@ ul.wizard {
ul.wizard li {
margin-right: 1em;
}
+
+form.modal ul.wizard li {
+ display: flex;
+ flex-direction: row;
+ width: 90%;
+ margin: 0.5em auto;
+ justify-items: center;
+}
+
+form.modal ul.wizard li * {
+ flex: 1;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index c3e1deb94c..7e49d32c83 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -122,6 +122,7 @@
letter-spacing: 0.3pt;
color: #000;
background-color: #fff;
+ cursor: pointer;
}
.info_table tr th {
@@ -341,3 +342,8 @@ a.pandora_pagination.current:hover {
background-position-y: center;
cursor: pointer;
}
+
+.info_table tr th.sorting_asc,
+.info_table tr th.sorting_desc {
+ padding-left: 15px;
+}