diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
index 6051a8c4..4704ea71 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
@@ -21,6 +21,7 @@ use Cadoles\PortalBundle\Entity\Appexternal;
use Cadoles\PortalBundle\Entity\Flux;
use Cadoles\PortalBundle\Entity\Projecttasktag;
use Cadoles\PortalBundle\Entity\Projecttaskstatus;
+use Cadoles\PortalBundle\Entity\Alertcategory;
use Cadoles\PortalBundle\Entity\Itemcategory;
use Cadoles\PortalBundle\Entity\Item;
@@ -95,6 +96,10 @@ class InitDataCommand extends ContainerAwareCommand
$metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
$metadata->setIdGenerator(new AssignedGenerator());
+ $metadata = $em->getClassMetaData('CadolesPortalBundle:Alertcategory');
+ $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
+ $metadata->setIdGenerator(new AssignedGenerator());
+
$metadata = $em->getClassMetaData('CadolesPortalBundle:Itemcategory');
$metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE);
$metadata->setIdGenerator(new AssignedGenerator());
@@ -318,6 +323,21 @@ class InitDataCommand extends ContainerAwareCommand
}
+//== ALERTCATEGORY========================================================================================================================================
+ $output->writeln(' > Creation Alert Category');
+
+ $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_megaphone2.png"]);
+ $entityAlertcategoryapp = $em->getRepository('CadolesPortalBundle:Alertcategory')->find(-100);
+ if(!$entityAlertcategoryapp) {
+ $entityAlertcategoryapp = new Alertcategory();
+ $entityAlertcategoryapp->setId(-100);
+ $entityAlertcategoryapp->setColor("00a996");
+ $entityAlertcategoryapp->setLabel('Annonces');
+ $entityAlertcategoryapp->setIcon($entityicon);
+ $em->persist($entityAlertcategoryapp);
+ }
+
+
//== ITEMCATEGORY========================================================================================================================================
$output->writeln(' > Creation Item Category');
@@ -1221,7 +1241,7 @@ class InitDataCommand extends ContainerAwareCommand
$entityWidget->setAutoajust(true);
$entityWidget->setBorder(false);
$entityWidget->setOpened(true);
- $entityWidget->setAccess(["config","user","group"]);
+ $entityWidget->setAccess(["config","group"]);
$parameter = json_decode('{"fields": []}');
$entityWidget->setParameter($parameter);
$em->persist($entityWidget);
@@ -1328,7 +1348,7 @@ class InitDataCommand extends ContainerAwareCommand
$entityWidget->setOpened(true);
$entityWidget->setAccess(["config","user","group"]);
$entityWidget->setColorbodyback("ffffff");
- $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icone", "value": "0", "mandatory": "true"}]}');
+ $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icône", "value": "0", "mandatory": "true"}]}');
$entityWidget->setParameter($parameter);
$em->persist($entityWidget);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
index 1d1953b9..27a0102f 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/BlogController.php
@@ -112,8 +112,9 @@ class BlogController extends Controller
foreach($datas as $data) {
$route=str_replace("_config_","_".$access."_",$this->routeprimary);
$action = "";
+ $action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
$action.="
$data->getId()))."' data-method='delete'>";
- $action.="
$data->getId()))."'>";
$user="";
if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
index 48f3fd6a..21b90872 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendarController.php
@@ -109,8 +109,9 @@ class CalendarController extends Controller
foreach($datas as $data) {
$route=str_replace("_config_","_".$access."_",$this->routeprimary);
$action = "";
+ $action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
$action.="
$data->getId()))."' data-method='delete'>";
- $action.="
$data->getId()))."'>";
$user="";
if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
index 7ebc3683..23421f0e 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
@@ -123,8 +123,9 @@ class PageController extends Controller
$route=str_replace("_config_","_".$access."_",$this->routeprimary);
$action = "";
//$action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
$action.="
$data->getId()))."' data-method='delete'>";
- $action.="
$data->getId()))."'>";
$user="";
if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
index 4377507f..26f55706 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php
@@ -102,9 +102,9 @@ class PagetemplateController extends Controller
$route=str_replace("_config_","_".$access."_",$this->routeprimary);
$action = "";
- //$action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
$action.="
$data->getId()))."' data-method='delete'>";
- $action.="
$data->getId()))."'>";
array_push($output["data"],[
$action,
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index e94e3132..5cb7ee85 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -1603,7 +1603,7 @@ class PagewidgetController extends Controller
$entity = $em->getRepository($this->labelentity)->find($id);
if (!$entity) throw $this->createNotFoundException('Unable to find entity.');
- $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
+ if($group) $groupentity=$em->getRepository("CadolesCoreBundle:Group")->find($group);
// Permissions
if($access=="config") {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
index 896560e0..08c9c6d7 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ProjectController.php
@@ -112,8 +112,10 @@ class ProjectController extends Controller
foreach($datas as $data) {
$route=str_replace("_config_","_".$access."_",$this->routeprimary);
$action = "";
+ $action.="
$data->getId()))."'>";
+ $action.="
$data->getId()))."'>";
$action.="
$data->getId()))."' data-method='delete'>";
- $action.="
$data->getId()))."'>";
+
$user="";
if($data->getUser()) {
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
index 3999c47c..3eb72d09 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Alertcategory.php
@@ -50,6 +50,13 @@ class Alertcategory
*/
protected $alerts;
+ // A garder pour forcer l'id en init
+ public function setId($id)
+ {
+ $this->id = $id;
+ return $this;
+ }
+
/**
* Constructor
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
index 64d8151e..a7a75e53 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
@@ -11,7 +11,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* @ORM\Entity
* @ORM\Table(name="icon")
* @ORM\HasLifecycleCallbacks
- * @UniqueEntity(fields="label", message="Un Icone existe déjà avec ce label")
+ * @UniqueEntity(fields="label", message="Une Icône existe déjà avec ce label")
*/
class Icon
{
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
index f74b8bf1..2a2f0045 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
@@ -57,7 +57,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
index d6067700..a43be08d 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/list.html.twig
@@ -24,7 +24,7 @@
- Action |
+ Action |
Nom |
Propriétaire |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
index 559e32d5..2f8b4faf 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/view.html.twig
@@ -6,7 +6,7 @@
{% if access=="config" %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
index bfdc030e..be282445 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
@@ -69,7 +69,7 @@
@@ -80,7 +80,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
index 0f92d536..3833cb22 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/list.html.twig
@@ -25,7 +25,7 @@
- Action |
+ Action |
Nom |
Propriétaire |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
index 0b7b982b..f0fe5711 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
@@ -6,7 +6,7 @@
{% if access=="config" %}
{% else %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
index e3f0f1d1..29ad6d25 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
@@ -71,7 +71,7 @@
@@ -82,7 +82,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
index 725c01a1..98b5da20 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/list.html.twig
@@ -25,7 +25,7 @@
- Action |
+ Action |
Ordre |
Nom |
Catégorie |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
index aaf08c36..9f580b14 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/vieweditor.html.twig
@@ -6,7 +6,7 @@
{% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
index e4882547..56cf7101 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig
@@ -16,7 +16,7 @@
{% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
index 5d517012..8b7735f7 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig
@@ -11,7 +11,7 @@
{{ entity.name }}
-
+
@@ -25,7 +25,7 @@
{% for pagewidget in entity.pagewidgets %}
-
+
{{ render(url(pagewidget.widget.routeview|replace({'_config_':'_'~access~'_'}),{id:pagewidget.id,by:mode,usage:usage,group:group})) }}
{% endfor %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
index 6016dc14..33344547 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagetemplate/list.html.twig
@@ -29,7 +29,7 @@
- Action |
+ Action |
Ordre |
Nom |
Pour |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
index 7fd234c0..bae13ed4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
@@ -61,7 +61,7 @@
@@ -93,7 +93,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
index 278c4808..9fbb4c36 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/list.html.twig
@@ -24,7 +24,7 @@
- Action |
+ Action |
Nom |
Propriétaire |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
index 131ed7ef..4d8c8a0b 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/view.html.twig
@@ -7,7 +7,7 @@
{% if access=="config" %}
diff --git a/tmpl/ninegate-init-01.sql b/tmpl/ninegate-init-01.sql
index 5907fa28..b39d9bd9 100644
--- a/tmpl/ninegate-init-01.sql
+++ b/tmpl/ninegate-init-01.sql
@@ -97,7 +97,7 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type
('006', 0, 1, 0, 'datauser', 'datauser', '', '', 'Parametrage des champs utilisateurs : obligatoire / facultatif / caché'),
('007', 0, 1, 0, 'datausers', 'datausers', '', '', 'Parametrage des colonnes visible dans la liste des utilisateurs'),
-('010', 1, 1, 1, 'boolean', 'fgforceconnect', '0', '', 'Forcer la connection afin de rendre votre site privé'),
+('010', 1, 1, 1, 'boolean', 'fgforceconnect', '0', '', 'Forcer la connexion afin de rendre votre site privé'),
('040', 1, 1, 1, 'boolean', 'fgheader', '1', '', 'Utiliser une image en bannière du site'),
('041', 1, 1, 1, 'header', 'header', 'uploads/header/header.png', 'fgheader', 'Image en bannière du site'),
diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml
index 4ddb4adb..666cc354 100644
--- a/tmpl/ninegate-template.yml
+++ b/tmpl/ninegate-template.yml
@@ -184,6 +184,20 @@ parameters:
ldap_email: mail
ldap_usersadmin: [admin]
+ # Template scribe
+%if %%getVar("ninegate_scribegroup", 'non') == "oui"
+ scribe_group: true
+%else
+ scribe_group: false
+%end if
+
+%if %%getVar("ninegate_scribemaster", 'non') == "oui"
+ scribe_master: true
+%else
+ scribe_master: false
+%end if
+
+
# Activation Widget
%if %%getVar("ninegate_activate_widadminer", 'non') == "oui"
activate_widadminer: true