fixed click events on page 2 and later

This commit is contained in:
Roland Gruber 2019-01-28 21:14:49 +01:00
parent b3d5b641f6
commit d15cde2507
1 changed files with 20 additions and 22 deletions

View File

@ -4,7 +4,7 @@ use LAM\TYPES\ConfiguredType;
/* /*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2018 Roland Gruber Copyright (C) 2003 - 2019 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -505,18 +505,17 @@ class lamList {
$table_end = ($this->page * $this->maxPageEntries); $table_end = ($this->page * $this->maxPageEntries);
} }
// get sort mapping // get sort mapping
$sortMapping = &$this->sortMapping; if (empty($this->sortMapping)) {
if (empty($sortMapping)) { $this->sortMapping = array();
$sortMapping = array();
$infoSize = sizeof($info); $infoSize = sizeof($info);
for ($i = 0; $i < $infoSize; $i++) { for ($i = 0; $i < $infoSize; $i++) {
$sortMapping[$i] = $i; $this->sortMapping[$i] = $i;
} }
} }
// print account list // print account list
for ($i = $table_begin; $i < $table_end; $i++) { for ($i = $table_begin; $i < $table_end; $i++) {
$row = array(); $row = array();
$index = $sortMapping[$i]; $index = $this->sortMapping[$i];
$rowID = base64_encode($info[$index]['dn']); $rowID = base64_encode($info[$index]['dn']);
$actionElement = new htmlGroup(); $actionElement = new htmlGroup();
$checkbox = new htmlInputCheckbox($rowID, false); $checkbox = new htmlInputCheckbox($rowID, false);
@ -524,8 +523,9 @@ class lamList {
$checkbox->setCSSClasses(array('accountBoxUnchecked align-middle')); $checkbox->setCSSClasses(array('accountBoxUnchecked align-middle'));
$actionElement->addElement($checkbox); $actionElement->addElement($checkbox);
$actionElement->addElement(new htmlSpacer('0.5rem', null)); $actionElement->addElement(new htmlSpacer('0.5rem', null));
$onClickEvents[$i + 2] = "list_click('" . $rowID . "');"; $rowNumber = $i - $table_begin + 2;
$onDoubleClickEvents[$i + 2] = "top.location.href='../account/edit.php?type=" . $this->type->getId() . "&amp;DN=" . rawurlencode($info[$index]['dn']) . "';"; $onClickEvents[$rowNumber] = "list_click('" . $rowID . "');";
$onDoubleClickEvents[$rowNumber] = "top.location.href='../account/edit.php?type=" . $this->type->getId() . "&amp;DN=" . rawurlencode($info[$index]['dn']) . "';";
$this->addToolLinks($info[$index], $rowID, $actionElement); $this->addToolLinks($info[$index], $rowID, $actionElement);
$row[] = new htmlDiv(null, $actionElement, array('nowrap')); $row[] = new htmlDiv(null, $actionElement, array('nowrap'));
foreach ($this->attrArray as $attributeName) { foreach ($this->attrArray as $attributeName) {
@ -719,8 +719,7 @@ class lamList {
} }
} }
// check if back from configuration page // check if back from configuration page
if (sizeof($this->configOptions) > 0) { if ((sizeof($this->configOptions) > 0) && isset($_POST['saveConfigOptions'])) {
if (isset($_POST['saveConfigOptions'])) {
$cookieValue = ''; $cookieValue = '';
for ($i = 0; $i < sizeof($this->configOptions); $i++) { for ($i = 0; $i < sizeof($this->configOptions); $i++) {
$this->configOptions[$i]->fillFromPostData(); $this->configOptions[$i]->fillFromPostData();
@ -731,7 +730,6 @@ class lamList {
// notify subclasses // notify subclasses
$this->listConfigurationChanged(); $this->listConfigurationChanged();
} }
}
return ''; return '';
} }
@ -759,11 +757,11 @@ class lamList {
echo "<div class=\"ui-tabs-nav " . $this->type->getScope() . "-bright\">"; echo "<div class=\"ui-tabs-nav " . $this->type->getScope() . "-bright\">";
echo "<div class=\"smallPaddingContent\">\n"; echo "<div class=\"smallPaddingContent\">\n";
$refresh = '&amp;norefresh=true'; $refreshParam = '&amp;norefresh=true';
if (isset($_GET['refresh']) && ($_GET['refresh'] == 'true')) { if (isset($_GET['refresh']) && ($_GET['refresh'] == 'true')) {
$refresh = '&amp;refresh=true'; $refreshParam = '&amp;refresh=true';
} }
echo "<form action=\"list.php?type=" . $this->type->getId() . $refresh . "\" method=\"post\">\n"; echo "<form action=\"list.php?type=" . $this->type->getId() . $refreshParam . "\" method=\"post\">\n";
$container = new htmlResponsiveRow(); $container = new htmlResponsiveRow();
$container->add(new htmlSubTitle(_('Create PDF file')), 12); $container->add(new htmlSubTitle(_('Create PDF file')), 12);