Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-03-03 16:39:00 +01:00
parent 0904f306ce 97cf0a727b
commit c17677e871
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dicos/91_ninegate.xml
View File

@ -127,6 +127,9 @@
<variable type='string' name='ninegate_keyterm' description="Durée de validité du jeton d'inscription" mandatory='True'><value>8</value></variable> <variable type='string' name='ninegate_keyterm' description="Durée de validité du jeton d'inscription" mandatory='True'><value>8</value></variable>
<variable type='string' name='ninegate_minpassword' description="Taille minimun du password" mandatory='True'><value>8</value></variable> <variable type='string' name='ninegate_minpassword' description="Taille minimun du password" mandatory='True'><value>8</value></variable>
<variable type='oui/non' name='ninegate_forcetheme' description="Forcer l'utilisation d'un thème"><value>non</value></variable>
<variable type='string' name='ninegate_forcethemename' description="Nom du thème"><value></value></variable>
<!-- MODULE PORTAL --> <!-- MODULE PORTAL -->
<variable type="oui/non" name='ninegate_activate_portal' description='Activer le module portail' mandatory='True'> <variable type="oui/non" name='ninegate_activate_portal' description='Activer le module portail' mandatory='True'>
@ -494,6 +497,8 @@
<target type='variable'>ninegate_moderegistration</target> <target type='variable'>ninegate_moderegistration</target>
<target type='variable'>ninegate_keyterm</target> <target type='variable'>ninegate_keyterm</target>
<target type='variable'>ninegate_minpassword</target> <target type='variable'>ninegate_minpassword</target>
<target type='variable'>ninegate_forcetheme</target>
<target type='variable'>ninegate_forcethemename</target>
<target type='variable'>ninegate_activate_portal</target> <target type='variable'>ninegate_activate_portal</target>
<target type='variable'>ninegate_activate_page</target> <target type='variable'>ninegate_activate_page</target>
@ -699,6 +704,13 @@
<target type='variable'>ninegate_addomaineprofil</target> <target type='variable'>ninegate_addomaineprofil</target>
</condition> </condition>
<!-- AFFICHAGE EN FONCTION DU FORCE THEME -->
<condition name='hidden_if_in' source='ninegate_forcetheme'>
<param>non</param>
<target type='variable'>ninegate_forcethemename</target>
</condition>
<!-- AFFICHAGE EN FONCTION DU MODULE PORTAL --> <!-- AFFICHAGE EN FONCTION DU MODULE PORTAL -->
<condition name='hidden_if_in' source='ninegate_activate_portal'> <condition name='hidden_if_in' source='ninegate_activate_portal'>
<param>non</param> <param>non</param>

21
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php
View File

@ -237,6 +237,27 @@ class InitDataCommand extends ContainerAwareCommand
$this->addModeration($profil,'cadoles_cron_config_log',0); $this->addModeration($profil,'cadoles_cron_config_log',0);
} }
// Forcer le theme
$force_theme=$this->getContainer()->getParameter('force_theme');
if($force_theme) {
// On force la configuration du theme
$force_themename=$this->getContainer()->getParameter('force_themename');
$config = $em->getRepository('CadolesCoreBundle:Config')->find("theme");
if($config) {
$config->setValue($force_themename);
$em->persist($config);
$em->flush();
}
// On enlève l'accès de la sidebar
$sidebar = $em->getRepository('CadolesCoreBundle:Sidebar')->findOneBy(["path"=>"cadoles_core_config_theme"]);
if($sidebar) {
$em->remove($sidebar);
$em->flush();
}
}
$output->writeln(''); $output->writeln('');
} }

9
tmpl/ninegate-template.yml
View File

@ -30,6 +30,15 @@ parameters:
%end if %end if
initpwdadmin: %%getVar("ninegate_pwdadmin", '') initpwdadmin: %%getVar("ninegate_pwdadmin", '')
# Force theme
%if %%getVar("ninegate_forcetheme", 'non') == "oui"
force_theme: true
force_themename: %%ninegate_forcethemename
%else
force_theme: false
force_themename:
%end if
# Activation module # Activation module
%if %%getVar("ninegate_activate_cron", 'non') == "oui" %if %%getVar("ninegate_activate_cron", 'non') == "oui"
cron_activate: true cron_activate: true