may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve PrijavaBlock variable caching issue

Browse Source
This commit is contained in:
Tilen Gombac 2022-10-28 12:54:30 +02:00
parent 3eae18f002
commit f237c94bf6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
View File

@ -26,15 +26,15 @@ function prijava_1ka_theme()
return [ return [
'prijava_block' => [ 'prijava_block' => [
'variables' => [ 'variables' => [
'prijavljen' => (isset($_COOKIE['unam']) ? true : false), 'prijavljen' => FALSE,
//'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']), //'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']),
//'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']), //'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']),
'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), 'jezik' => '',
'google2fa_error' => '', 'google2fa_error' => '',
'email' => '', 'email' => '',
'password' => '', 'password' => '',
'error' => '' 'error' => '',
//'lang' => // TU moramo pridobiti spremenljivke iz 1ka.si 'lang' => [],
] ]
], ],
'prijava_intro_block' => [ 'prijava_intro_block' => [

11
frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaBlock.php
View File

@ -64,8 +64,19 @@ class PrijavaBlock extends BlockBase implements ContainerFactoryPluginInterface
public function build() { public function build() {
//return $this->formBuilder->getForm('Drupal\prijava_1ka\Form\PrijavaBlockForm'); //return $this->formBuilder->getForm('Drupal\prijava_1ka\Form\PrijavaBlockForm');
$currentLanguage = \Drupal::languageManager()->getCurrentLanguage()->getId();
if($currentLanguage == 'sl') {
include(__DIR__ . '../../../../../../../../../lang/1.php');
} else{
include(__DIR__ . '../../../../../../../../../lang/2.php');
}
return [ return [
'#theme' => 'prijava_block', '#theme' => 'prijava_block',
'#prijavljen' => isset($_COOKIE['unam']),
'#jezik' => $currentLanguage,
'#lang' => $lang ?? [],
]; ];
} }