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

This commit is contained in:
Arnaud Fornerot 2020-09-02 16:25:44 +02:00
commit 6da8f15c2d
5 changed files with 122 additions and 0 deletions

View File

@ -33,11 +33,13 @@
<variable name="activer_balado" type="oui/non" description="Activer Balado" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_balado" type="oui/non" description="Activer Balado" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_dokuwiki" type="oui/non" description="Activer Dokuwiki" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_dokuwiki" type="oui/non" description="Activer Dokuwiki" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_econnect" type="oui/non" description="Activer eConnect" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_econnect" type="oui/non" description="Activer eConnect" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_ead_web" type="oui/non" description="Activer EAD" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_eoe" type="oui/non" description="Activer EOE" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_eoe" type="oui/non" description="Activer EOE" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_eop" type="oui/non" description="Activer EOP" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_eop" type="oui/non" description="Activer EOP" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_fluxbb" type="oui/non" description="Activer Fluxbb" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_fluxbb" type="oui/non" description="Activer Fluxbb" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_genconfig" type="oui/non" description="Activer Genconfig" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_gepi" type="oui/non" description="Activer GEPI" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_gepi" type="oui/non" description="Activer GEPI" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_glpi" type="oui/non" description="Activer GLPI" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_glpi" type="oui/non" description="Activer GLPI" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_grr" type="oui/non" description="Activer Grr" hidden='True' exists='False'><value>non</value></variable> <variable name="activer_grr" type="oui/non" description="Activer Grr" hidden='True' exists='False'><value>non</value></variable>
@ -181,6 +183,12 @@
</variable> </variable>
<variable type='string' name='ninegate_wideconnect_url' description='URL complète de votre eConnect' mandatory='True' /> <variable type='string' name='ninegate_wideconnect_url' description='URL complète de votre eConnect' mandatory='True' />
<!-- EAD -->
<variable type="oui/non" name='ninegate_activate_widead' description='Activer EAD' mandatory='True'>
<value>non</value>
</variable>
<variable type='string' name='ninegate_widead_url' description='URL complète de votre EAD' mandatory='True' />
<!-- EOE --> <!-- EOE -->
<variable type="oui/non" name='ninegate_activate_wideoe' description='Activer EOE' mandatory='True'> <variable type="oui/non" name='ninegate_activate_wideoe' description='Activer EOE' mandatory='True'>
<value>non</value> <value>non</value>
@ -205,6 +213,12 @@
</variable> </variable>
<variable type='string' name='ninegate_widfluxbb_url' description='URL complète de votre Fluxbb' mandatory='True' /> <variable type='string' name='ninegate_widfluxbb_url' description='URL complète de votre Fluxbb' mandatory='True' />
<!-- GENCONFIG -->
<variable type="oui/non" name='ninegate_activate_widgenconfig' description='Activer Genconfig' mandatory='True'>
<value>non</value>
</variable>
<variable type='string' name='ninegate_widgenconfig_url' description='URL complète de votre Genconfig' mandatory='True' />
<!-- GEPI --> <!-- GEPI -->
<variable type="oui/non" name='ninegate_activate_widgepi' description='Activer GEPI' mandatory='True'> <variable type="oui/non" name='ninegate_activate_widgepi' description='Activer GEPI' mandatory='True'>
<value>non</value> <value>non</value>
@ -360,10 +374,12 @@
<separator name="ninegate_activate_widbalado">Paramètres associés à Balado</separator> <separator name="ninegate_activate_widbalado">Paramètres associés à Balado</separator>
<separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator> <separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator>
<separator name="ninegate_activate_wideconnect">Paramètres associés à eConnect</separator> <separator name="ninegate_activate_wideconnect">Paramètres associés à eConnect</separator>
<separator name="ninegate_activate_widead">Paramètres associés à EAD</separator>
<separator name="ninegate_activate_wideoe">Paramètres associés à EOE</separator> <separator name="ninegate_activate_wideoe">Paramètres associés à EOE</separator>
<separator name="ninegate_activate_wideop">Paramètres associés à EOP</separator> <separator name="ninegate_activate_wideop">Paramètres associés à EOP</separator>
<separator name="ninegate_activate_widetherhome">Paramètres associés à Etherhome</separator> <separator name="ninegate_activate_widetherhome">Paramètres associés à Etherhome</separator>
<separator name="ninegate_activate_widfluxbb">Paramètres associés à Fluxbb</separator> <separator name="ninegate_activate_widfluxbb">Paramètres associés à Fluxbb</separator>
<separator name="ninegate_activate_widgenconfig">Paramètres associés à GENCONFIG</separator>
<separator name="ninegate_activate_widgepi">Paramètres associés à GEPI</separator> <separator name="ninegate_activate_widgepi">Paramètres associés à GEPI</separator>
<separator name="ninegate_activate_widglpi">Paramètres associés à GLPI</separator> <separator name="ninegate_activate_widglpi">Paramètres associés à GLPI</separator>
<separator name="ninegate_activate_widgrr">Paramètres associés à Grr</separator> <separator name="ninegate_activate_widgrr">Paramètres associés à Grr</separator>
@ -549,10 +565,12 @@
<target type='variable'>ninegate_activate_widbalado</target> <target type='variable'>ninegate_activate_widbalado</target>
<target type='variable'>ninegate_activate_widdokuwiki</target> <target type='variable'>ninegate_activate_widdokuwiki</target>
<target type='variable'>ninegate_activate_wideconnect</target> <target type='variable'>ninegate_activate_wideconnect</target>
<target type='variable'>ninegate_activate_widead</target>
<target type='variable'>ninegate_activate_wideoe</target> <target type='variable'>ninegate_activate_wideoe</target>
<target type='variable'>ninegate_activate_wideop</target> <target type='variable'>ninegate_activate_wideop</target>
<target type='variable'>ninegate_activate_widetherhome</target> <target type='variable'>ninegate_activate_widetherhome</target>
<target type='variable'>ninegate_activate_widfluxbb</target> <target type='variable'>ninegate_activate_widfluxbb</target>
<target type='variable'>ninegate_activate_widgenconfig</target>
<target type='variable'>ninegate_activate_widgepi</target> <target type='variable'>ninegate_activate_widgepi</target>
<target type='variable'>ninegate_activate_widglpi</target> <target type='variable'>ninegate_activate_widglpi</target>
<target type='variable'>ninegate_activate_widgrr</target> <target type='variable'>ninegate_activate_widgrr</target>
@ -735,7 +753,27 @@
</fill> </fill>
<!-- AFFICHAGE EN FONCTION DU WIDGET EAD -->
<fill name='calc_multi_condition' target='ninegate_activate_widead'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_ead_web</param>
<param name='match'>oui</param>
<param name='mismatch'>non</param>
<param name='default_mismatch'>non</param>
</fill>
<condition name='hidden_if_in' source='ninegate_activate_widead'>
<param>non</param>
<target type='variable'>ninegate_widead_url</target>
</condition>
<fill name='concat' target='ninegate_widead_url'>
<param>https://</param>
<param type='eole'>web_url</param>
<param>:4200</param>
</fill>
<!-- AFFICHAGE EN FONCTION DU WIDGET EOE --> <!-- AFFICHAGE EN FONCTION DU WIDGET EOE -->
<fill name='calc_multi_condition' target='ninegate_activate_wideoe'> <fill name='calc_multi_condition' target='ninegate_activate_wideoe'>
<param>oui</param> <param>oui</param>
@ -832,6 +870,30 @@
<!-- AFFICHAGE EN FONCTION DU WIDGET GENCONFIG -->
<fill name='calc_multi_condition' target='ninegate_activate_widgenconfig'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_genconfig</param>
<param name='match'>oui</param>
<param name='mismatch'>non</param>
<param name='default_mismatch'>non</param>
</fill>
<condition name='hidden_if_in' source='ninegate_activate_widgenconfig'>
<param>non</param>
<target type='variable'>ninegate_widgenconfig_url</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widgenconfig_url'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_genconfig</param>
<param name='match'>/genconfig</param>
<param name='default_mismatch'>None</param>
</fill>
<!-- AFFICHAGE EN FONCTION DU WIDGET GEPI --> <!-- AFFICHAGE EN FONCTION DU WIDGET GEPI -->
<fill name='calc_multi_condition' target='ninegate_activate_widgepi'> <fill name='calc_multi_condition' target='ninegate_activate_widgepi'>
<param>oui</param> <param>oui</param>

View File

@ -45,10 +45,12 @@ class InitDataCommand extends ContainerAwareCommand
$activate_widbalado = $this->getContainer()->getParameter('activate_widbalado'); $activate_widbalado = $this->getContainer()->getParameter('activate_widbalado');
$activate_widdokuwiki = $this->getContainer()->getParameter('activate_widdokuwiki'); $activate_widdokuwiki = $this->getContainer()->getParameter('activate_widdokuwiki');
$activate_wideconnect = $this->getContainer()->getParameter('activate_wideconnect'); $activate_wideconnect = $this->getContainer()->getParameter('activate_wideconnect');
$activate_widead = $this->getContainer()->getParameter('activate_widead');
$activate_wideoe = $this->getContainer()->getParameter('activate_wideoe'); $activate_wideoe = $this->getContainer()->getParameter('activate_wideoe');
$activate_wideop = $this->getContainer()->getParameter('activate_wideop'); $activate_wideop = $this->getContainer()->getParameter('activate_wideop');
$activate_widetherhome = $this->getContainer()->getParameter('activate_widetherhome'); $activate_widetherhome = $this->getContainer()->getParameter('activate_widetherhome');
$activate_widfluxbb = $this->getContainer()->getParameter('activate_widfluxbb'); $activate_widfluxbb = $this->getContainer()->getParameter('activate_widfluxbb');
$activate_widgenconfig = $this->getContainer()->getParameter('activate_widgenconfig');
$activate_widgepi = $this->getContainer()->getParameter('activate_widgepi'); $activate_widgepi = $this->getContainer()->getParameter('activate_widgepi');
$activate_widglpi = $this->getContainer()->getParameter('activate_widglpi'); $activate_widglpi = $this->getContainer()->getParameter('activate_widglpi');
$activate_widgrr = $this->getContainer()->getParameter('activate_widgrr'); $activate_widgrr = $this->getContainer()->getParameter('activate_widgrr');
@ -452,6 +454,28 @@ class InitDataCommand extends ContainerAwareCommand
$em->persist($entityItem); $em->persist($entityItem);
} }
// Item EAD
if($activate_widead) {
$widead_url =$this->getContainer()->getParameter('widead_url');
$entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-393);
if(!$entityItem) {
$entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_ead.png"]);
$entityItem = new Item();
$entityItem->setId(-393);
$entityItem->setRowOrder(0);
$entityItem->setTitle('EAD');
$entityItem->SetSubtitle("Console d'administration du serveur scribe");
$entityItem->setIcon($entityicon);
$entityItem->setTarget("_blank");
$entityItem->setItemcategory($entityItemcategoryadm);
$entityItem->setEssential(true);
$entityItem->setRoles(["ROLE_ADMIN"]);
}
$entityItem->setUrl($widead_url);
$em->persist($entityItem);
}
// Item EOE // Item EOE
if($activate_wideoe) { if($activate_wideoe) {
$wideoe_url =$this->getContainer()->getParameter('wideoe_url'); $wideoe_url =$this->getContainer()->getParameter('wideoe_url');
@ -540,6 +564,28 @@ class InitDataCommand extends ContainerAwareCommand
$em->persist($entityItem); $em->persist($entityItem);
} }
// Item genconfig
if($activate_widgenconfig) {
$widgenconfig_url =$this->getContainer()->getParameter('widgenconfig_url');
$entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-368);
if(!$entityItem) {
$entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_genconfig.png"]);
$entityItem = new Item();
$entityItem->setId(-368);
$entityItem->setRowOrder(0);
$entityItem->setTitle('Genconfig');
$entityItem->SetSubtitle("Console de configuration du serveur");
$entityItem->setIcon($entityicon);
$entityItem->setTarget("_blank");
$entityItem->setItemcategory($entityItemcategoryadm);
$entityItem->setEssential(true);
$entityItem->setRoles(["ROLE_ADMIN"]);
}
$entityItem->setUrl($widgenconfig_url);
$em->persist($entityItem);
}
// Item gepi // Item gepi
if($activate_widgepi) { if($activate_widgepi) {
$widgepi_url =$this->getContainer()->getParameter('widgepi_url'); $widgepi_url =$this->getContainer()->getParameter('widgepi_url');

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@ -234,6 +234,13 @@ parameters:
activate_wideconnect: false activate_wideconnect: false
%end if %end if
%if %%getVar("ninegate_activate_widead", 'non') == "oui"
activate_widead: true
widead_url: %%ninegate_widead_url
%else
activate_widead: false
%end if
%if %%getVar("ninegate_activate_wideoe", 'non') == "oui" %if %%getVar("ninegate_activate_wideoe", 'non') == "oui"
activate_wideoe: true activate_wideoe: true
wideoe_url: %%ninegate_wideoe_url wideoe_url: %%ninegate_wideoe_url
@ -262,6 +269,13 @@ parameters:
activate_widfluxbb: false activate_widfluxbb: false
%end if %end if
%if %%getVar("ninegate_activate_widgenconfig", 'non') == "oui"
activate_widgenconfig: true
widgenconfig_url: %%ninegate_widgenconfig_url
%else
activate_widgenconfig: false
%end if
%if %%getVar("ninegate_activate_widgepi", 'non') == "oui" %if %%getVar("ninegate_activate_widgepi", 'non') == "oui"
activate_widgepi: true activate_widgepi: true
widgepi_url: %%ninegate_widgepi_url widgepi_url: %%ninegate_widgepi_url