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 2020-02-28 10:58:13 +01:00
parent c813e78c69 cc846026bc
commit c788b97fca
5 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dicos/90_ninegate.xml
View File

@ -33,6 +33,7 @@
<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_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_grr" type="oui/non" description="Activer Grr" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_kanboard" type="oui/non" description="Activer Kanboard" hidden='True' exists='False'><value>non</value></variable>
<variable name="activer_limesurvey" type="oui/non" description="Activer Limesurvey" hidden='True' exists='False'><value>non</value></variable>
@ -187,6 +188,12 @@
<variable type='string' name='ninegate_widgepi_url' description='URL complète de votre GEPI' mandatory='True' />
<variable type='string' name='ninegate_widgepi_syncenvole' description='URL Posh-Profil pour synchronisation GEPI' mandatory='True' />
<!-- GLPI -->
<variable type="oui/non" name='ninegate_activate_widglpi' description='Activer GLPI' mandatory='True'>
<value>non</value>
</variable>
<variable type='string' name='ninegate_widglpi_url' description='URL complète de votre GLPI' mandatory='True' />
<!-- GRR -->
<variable type="oui/non" name='ninegate_activate_widgrr' description='Activer Grr' mandatory='True'>
<value>non</value>
@ -326,6 +333,7 @@
<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_widgepi">Paramètres associés à GEPI</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_widkanboard">Paramètres associés à Kanboard</separator>
<separator name="ninegate_activate_widlimesurvey">Paramètres associés à Limesurvey</separator>
@ -485,6 +493,7 @@
<target type='variable'>ninegate_activate_widetherhome</target>
<target type='variable'>ninegate_activate_widfluxbb</target>
<target type='variable'>ninegate_activate_widgepi</target>
<target type='variable'>ninegate_activate_widglpi</target>
<target type='variable'>ninegate_activate_widgrr</target>
<target type='variable'>ninegate_activate_widkanboard</target>
<target type='variable'>ninegate_activate_widlimesurvey</target>
@ -744,6 +753,30 @@
<!-- AFFICHAGE EN FONCTION DU WIDGET GLPI -->
<fill name='calc_multi_condition' target='ninegate_activate_widglpi'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_glpi</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_widglpi'>
<param>non</param>
<target type='variable'>ninegate_widglpi_url</target>
</condition>
<fill name='calc_multi_condition' target='ninegate_widglpi_url'>
<param>oui</param>
<param type='eole' name='condition_1' hidden='False'>activer_glpi</param>
<param name='match'>/glpi</param>
<param name='default_mismatch'>None</param>
</fill>
<!-- AFFICHAGE EN FONCTION DU WIDGET GRR -->
<fill name='calc_multi_condition' target='ninegate_activate_widgrr'>
<param>oui</param>

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
View File

@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
(-100, 'Interne', 'SIREN');
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}RpichoTKCN2p1e9VPz1JnGxjaZ7Xe1Eq
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}2oV9M1Ofw14hGll+W1oPHxR7E2SZvzFz
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');

23
src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
View File

@ -45,6 +45,7 @@ class InitDataCommand extends ContainerAwareCommand
$activate_widetherhome = $this->getContainer()->getParameter('activate_widetherhome');
$activate_widfluxbb = $this->getContainer()->getParameter('activate_widfluxbb');
$activate_widgepi = $this->getContainer()->getParameter('activate_widgepi');
$activate_widglpi = $this->getContainer()->getParameter('activate_widglpi');
$activate_widgrr = $this->getContainer()->getParameter('activate_widgrr');
$activate_widkanboard = $this->getContainer()->getParameter('activate_widkanboard');
$activate_widlimesurvey = $this->getContainer()->getParameter('activate_widlimesurvey');
@ -402,6 +403,28 @@ class InitDataCommand extends ContainerAwareCommand
$em->persist($entityItem);
}
// Item glpi
if($activate_widglpi) {
$widglpi_url =$this->getContainer()->getParameter('widglpi_url');
$entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-388);
if(!$entityItem) {
$entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_glpi.png"]);
$entityItem = new Item();
$entityItem->setId(-388);
$entityItem->setRowOrder(0);
$entityItem->setTitle('GLPI');
$entityItem->SetSubtitle("Gestion de tickets");
$entityItem->setIcon($entityicon);
$entityItem->setTarget("_blank");
$entityItem->setItemcategory($entityItemcategoryapp);
$entityItem->setEssential(true);
$entityItem->addGroup($groupall);
}
$entityItem->setUrl($widglpi_url);
$em->persist($entityItem);
}
// Item grr
if($activate_widgrr) {
$widgrr_url =$this->getContainer()->getParameter('widgrr_url');

BIN
src/ninegate-1.0/web/uploads/icon/icon_glpi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

7
tmpl/ninegate-template.yml
View File

@ -241,6 +241,13 @@ parameters:
widgepi_activate_syncenvole: false
%end if
%if %%getVar("ninegate_activate_widglpi", 'non') == "oui"
activate_widglpi: true
widglpi_url: %%ninegate_widglpi_url
%else
activate_widglpi: false
%end if
%if %%getVar("ninegate_activate_widgrr", 'non') == "oui"
activate_widgrr: true
widgrr_url: %%ninegate_widgrr_url