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-05 15:22:17 +01:00
parent b40e3c4eb8 3c90728464
commit a11928569b
5 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Page.php
View File

@ -60,6 +60,13 @@ class Page
*/
private $url;
/**
* @var boolean
*
* @ORM\Column(name="toreload", type="boolean", nullable=true)
*/
private $toreload;
/**
* @var string
*
@ -616,4 +623,28 @@ class Page
{
return $this->fonticon;
}
/**
* Set toreload
*
* @param boolean $toreload
*
* @return Page
*/
public function setToreload($toreload)
{
$this->toreload = $toreload;
return $this;
}
/**
* Get toreload
*
* @return boolean
*/
public function getToreload()
{
return $this->toreload;
}
}

5
src/ninegate-1.0/src/Cadoles/PortalBundle/Form/PageUpdateURLType.php
View File

@ -31,6 +31,11 @@ class PageUpdateURLType extends AbstractType
'label' => 'URL'
])
->add("toreload",ChoiceType::class,[
"label" =>"Forcer le rechargement de l'url à chaque accès à cette page",
"choices" => ["non"=>"0","oui"=>"1"]
])
->add('roworder', IntegerType::class, [
'label' => 'Ordre',
])

6
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
View File

@ -4,7 +4,7 @@
{% for page in groupshared.pagesshared %}
{% set forcereload=true %}
{% if page.pagecategory.id==1 %}
{% set forcereload=false %}
{% set forcereload=page.toreload %}
{% endif %}
{% set isactive="" %}
@ -46,7 +46,7 @@
{% set page = groupshared.pagesshared[0] %}
{% set forcereload=true %}
{% if page.pagecategory.id==1 %}
{% set forcereload=false %}
{% set forcereload=page.toreload %}
{% endif %}
{% set isactive="" %}
@ -84,7 +84,7 @@
{% for page in groupshared.pagesshared %}
{% set forcereload=true %}
{% if page.pagecategory.id==1 %}
{% set forcereload=false %}
{% set forcereload=page.toreload %}
{% endif %}
{% set isactive="" %}

5
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
View File

@ -10,7 +10,7 @@
{% for page in pagesadmin %}
{% set forcereload=true %}
{% if page.pagecategory.id==1 %}
{% set forcereload=false %}
{% set forcereload=page.toreload %}
{% endif %}
{% if entity.id is defined and page.id==entity.id %}
@ -39,9 +39,10 @@
{% for page in pagesuser %}
{% set forcereload=true %}
{% if page.pagecategory.id==1 %}
{% set forcereload=false %}
{% set forcereload=page.toreload %}
{% endif %}
{% if entity.id is defined and page.id==entity.id %}
<li id="menupage-{{page.id}}" class="active" style="cursor:pointer">
<a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')">

4
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig
View File

@ -56,7 +56,9 @@
{{ form_row(form.name) }}
{{ form_row(form.url) }}
<em>le mot clé #login# sera remplacé par le login de l'utilisateur</em><br>
<em>Attention certains sites n'acceptent pas d'être encapsulés dans une frame.<br><br>
<em>Attention certains sites n'acceptent pas d'être encapsulés dans une frame.<br><br></em>
{{ form_row(form.toreload) }}
{{ form_row(form.roworder) }}
{{ form_row(form.fonticon) }}
{{ form_row(form.maxwidth) }}