Skip to content

Fix command select using key OR value for selected #3052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flobul wants to merge 3 commits into
base: alpha
Choose a base branch
from
Open

Fix command select using key OR value for selected #3052

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4065c5c
Use of listValueSelected for select listValue
Flobul Apr 20, 2025
bb039ff
Add listValueSelected in cmd.configure.php
Flobul Apr 20, 2025
430574c
Update cmd.class.php
Flobul Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/class/cmd.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,8 @@ public function toHtml($_version = 'dashboard', $_options = '') {
$coupleArray = explode('|', $element);
$cmdValue = $this->getCmdValue();
if (is_object($cmdValue) && $cmdValue->getType() == 'info') {
if ($cmdValue->execCmd() == $coupleArray[0] || $cmdValue->execCmd() == $coupleArray[1]) {
$keySeclected = intval($this->getConfiguration('listValueSelected', 0));
Copy link
Contributor

@kwizer15 kwizer15 Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$keySelected (instead of $keySeclected)

if ($cmdValue->execCmd() == $coupleArray[$keySeclected]) {
Copy link
Contributor

@kwizer15 kwizer15 Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$keySelected

$listOption .= '<option value="' . $coupleArray[0] . '" selected>' . $coupleArray[1] . '</option>';
$foundSelect = true;
} else {
Expand Down
6 changes: 6 additions & 0 deletions desktop/modal/cmd.configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@
?>
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{Sélection par index de valeur}}</label>
<div class="col-xs-8">
<input type="checkbox" class="cmdAttr" data-l1key="configuration" data-l2key="listValueSelected" />
Copy link
Contributor

@kwizer15 kwizer15 Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a select input will be more appropriate.

Copy link
Contributor Author

@Flobul Flobul Apr 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
Should be easier to understand, I think.

</div>
</div>
<?php } ?>
<div class="form-group">
<label class="col-xs-4 control-label">{{Dernière exécution par}}</label>
Expand Down