CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some post fixes for edit_base and core libs update

Browse Source 
- edit order template indent fix
- Form/Generate init had wrong check on array for load list query
- ACL for group level was still using old session name
This commit is contained in:
Clemens Schwaighofer
2019-05-28 13:22:18 +09:00
parent 70d51025f8
commit 89c2b54889
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/includes/edit_base.inc
View File

@@ -18,6 +18,7 @@
*********************************************************************/
$DEBUG_ALL = 1;
$PRINT_ALL = 1;
$DB_DEBUG = 1;
// TODO: only extract _POST data that is needed

26
www/includes/templates/admin/edit_order.tpl
View File

@@ -32,15 +32,15 @@
<!-- BODY START //-->
<tr>
<td class="edit_bgcolor">
<table width="100%" border="0" cellpadding="2" cellspacing="1">
<!-- ANFANG Neu //-->
<form method="post" enctype="multipart/form-data">
<tr>
<table width="100%" border="0" cellpadding="2" cellspacing="1">
<!-- ANFANG Neu //-->
<form method="post" enctype="multipart/form-data">
<tr>
<td class="edit_fgcolor_alt" class="normal" colspan="2">
Order
</td>
</tr>
<tr>
</tr>
<tr>
<td class="edit_fgcolor" class="normal" width="80%">
<select name="position[]" size="20" multiple>
{html_options values=$options_id output=$options_name selected=$options_selected}
@@ -65,15 +65,15 @@
<input type="hidden" name="where_string" value="{$where_string}">
<!-- single hiddens //-->
</td>
</tr>
<tr>
</tr>
<tr>
<td class="edit_fgcolor_alt" class="normal" colspan="2">
<input type="button" name="close" value="Close" OnClick="self.close();">
<input type="button" name="close" value="Close" OnClick="self.close();">
</td>
</tr>
</form>
<!-- ENDE FOOTER //-->
</table>
</tr>
</form>
<!-- ENDE FOOTER //-->
</table>
</td>
</tr>
<!-- BODY END //-->

6
www/lib/CoreLibs/Output/Form/Generate.inc
View File

@@ -282,7 +282,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
if (isset($config_array['show_fields']) && is_array($config_array['show_fields'])) {
$this->field_array = $config_array['show_fields'];
}
if (isset($config_array['load_query']) && is_array($config_array['load_query'])) {
if (isset($config_array['load_query']) && $config_array['load_query']) {
$this->load_query = $config_array['load_query'];
}
$this->archive_pk_name = 'a_'.$this->pk_name;
@@ -313,7 +313,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$this->remove_button = $_POST['remove_button'];
// security settings
$this->group_level_user = $_SESSION['GROUP_LEVEL'];
$this->group_level_user = isset($_SESSION['GROUP_ACL_LEVEL']) ? $_SESSION['GROUP_ACL_LEVEL'] : 0;
// security levels for buttons/actions
// if array does not exists create basic
if (!is_array($config_array['security_level']) || count($config_array['security_level']) < 4) {
@@ -565,7 +565,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
if ($this->group_level_user <= $this->security_level['load']) {
$t_pk_name = $this->archive_pk_name;
// lade liste
// load list data
$this->dbExec($this->load_query);
while ($res = $this->dbFetchArray()) {
$pk_ids[] = $res[$this->int_pk_name];