s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-01-12 06:41:14 +01:00
Code Issues Projects Releases Wiki Activity

Improved compatibility to Xentral 20 database

Browse Source
This commit is contained in:
root 2022-09-04 09:57:00 +00:00
parent 2bb3130b00
commit 383524f348
2 changed files with 1216 additions and 1203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2404
phpwf/plugins/class.acl.php
View File

File diff suppressed because it is too large Load Diff

15
www/pages/welcome.php
View File

@ -890,18 +890,23 @@ $this->app->Tpl->Add('TODOFORUSER',"<tr><td width=\"90%\">".$tmp[$i]['aufgabe'].
$this->app->erp->RunHook('welcome_start', 1 , $this); $this->app->erp->RunHook('welcome_start', 1 , $this);
if(empty($this->app->User->GetField('role')) || $this->app->acl->IsAdminadmin()) { // Xentral 20 database compatibility
$this->app->ModuleScriptCache->IncludeWidgetNew('ClickByClickAssistant'); if ($this->app->DB->Select("SHOW COLUMNS FROM `user` LIKE 'role'")) {
$this->app->ModuleScriptCache->IncludeJavascriptFiles(
if(empty($this->app->User->GetField('role')) || $this->app->acl->IsAdminadmin()) {
$this->app->ModuleScriptCache->IncludeWidgetNew('ClickByClickAssistant');
$this->app->ModuleScriptCache->IncludeJavascriptFiles(
'welcome', 'welcome',
[ [
'body' => [ 'body' => [
'./classes/Modules/Welcome/www/js/welcome_firststart.js', './classes/Modules/Welcome/www/js/welcome_firststart.js',
], ],
] ]
); );
$this->app->Tpl->Parse('AUFGABENPOPUP', 'welcome_firststart.tpl'); $this->app->Tpl->Parse('AUFGABENPOPUP', 'welcome_firststart.tpl');
}
} }
if($this->app->User->GetType() === 'admin') { if($this->app->User->GetType() === 'admin') {
$this->app->Tpl->Set('COLROWTASKS', '6'); $this->app->Tpl->Set('COLROWTASKS', '6');
} }