Skip to content
Snippets Groups Projects
Commit 0a507ea0 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline#28305_un_redacteur_a_le_droit_de_modifier_le_nom_de_domaine' into 'stable'

Hotline#28305 un redacteur a le droit de modifier le nom de domaine

See merge request !1112
parents ec087702 04f35c65
No related merge requests found
- ticket #28305 : seul les admins et le super admin ont la possibilité de modifier le nom du domaine
\ No newline at end of file
......@@ -9,7 +9,7 @@ echo $this->tag('h2',
<h2><?php echo $this->traduire('Paramètres du site');?>&nbsp;:</h2>
<?php
$profil = Class_Profil::getCurrentProfil();
$lien_edit_site = $lien = '';
$lien_edit_site = $lien = $edit_domain_name = '';
if ($this->user->isAdmin()) {
$lien = sprintf('<a href="admin?setsiteok=%s" style="margin-left:30px">&raquo;&nbsp;%s&nbsp;&laquo;</a>',
$this->href_site, $this->lien_site);
......@@ -17,19 +17,20 @@ if ($this->user->isAdmin()) {
$this->url(array('controller' => 'profil',
'action' => 'accueil',
'id_profil' => $profil->getId())));
$edit_domain_name = $this->tagAnchor($this->url(['module' => 'admin',
'controller' => 'index',
'action' => 'adminvaredit',
'cle'=> 'NOM_DOMAINE']),
'» Modifier «',
['style' => 'margin-left: 30px;',
'data-popup' => 'true']);
}
echo $this->ligneInfos("Etat du site", $this->etat_site . $lien)
. $this->ligneInfos("Profil", $profil->getLibelle() . $lien_edit_site)
. $this->ligneInfos("Thème", $profil->getSkin())
. $this->ligneInfos('Nom du domaine',
Class_AdminVar::get('NOM_DOMAINE') . $this->tagAnchor($this->url(['module' => 'admin',
'controller' => 'index',
'action' => 'adminvaredit',
'cle'=> 'NOM_DOMAINE']),
'» Modifier «',
['style' => 'margin-left: 30px;',
'data-popup' => 'true']));
. $this->ligneInfos('Nom du domaine', Class_AdminVar::get('NOM_DOMAINE') . $edit_domain_name);
?>
<h2><?php echo $this->traduire('Accès');?>&nbsp;:</h2>
......
......@@ -664,3 +664,36 @@ class AdminIndexControllerAdminVarEditComboInvalidPostActionTest
$this->assertNotEquals(19, Class_AdminVar::get('NEWSLETTER_ID_PROFIL'));
}
}
class AdminIndexControllerDisplayModifierNomDomaineTest extends AbstractControllerTestCase {
/** @test */
public function ModifierNomDomaineShouldBePresent() {
$user = $this->fixture('Class_Users', ['id' => 8,
'login' => 'joe',
'password' => 'foo',
'role_level' => ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL]);
ZendAfi_Auth::getInstance()->logUser($user);
$this->dispatch('/admin/index', true);
$this->assertXpathContentContains('//div[@class="modules"]//a', 'Modifier');
}
/** @test */
public function ModifierNomDomaineShouldNotBePresent() {
$user = $this->fixture('Class_Users', ['id' => 8,
'login' => 'joe',
'password' => 'foo',
'role_level' => ZendAfi_Acl_AdminControllerRoles::MODO_PORTAIL]);
ZendAfi_Auth::getInstance()->logUser($user);
$this->dispatch('/admin/index', true);
$this->assertNotXpathContentContains('//div[@class="modules"]//a', 'Modifier');
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment