From 80fba7a01f8458f00b7da654c58628219f24fc90 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Sat, 17 Nov 2012 14:51:23 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20lien=20pour=20modifier=20les=20articles?=
=?UTF-8?q?=20depuis=20la=20mod=C3=A9ration=20des=20formulaires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/views/scripts/modo/articlesformulaires.phtml | 5 +++--
public/admin/css/global.css | 6 ++++++
.../admin/controllers/ModoControllerFormulaireTest.php | 10 ++++++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/application/modules/admin/views/scripts/modo/articlesformulaires.phtml b/application/modules/admin/views/scripts/modo/articlesformulaires.phtml
index 13edd99c7b1..eb228ee367b 100644
--- a/application/modules/admin/views/scripts/modo/articlesformulaires.phtml
+++ b/application/modules/admin/views/scripts/modo/articlesformulaires.phtml
@@ -1,7 +1,7 @@
<?php
echo '<ul>';
foreach ($this->articles as $article) {
- echo sprintf('<li><a href="%s">%s [%d/%d]</a></li>',
+ echo sprintf('<li><a href="%s">%s [%d/%d]</a>%s</li>',
$this->url(['module' => 'admin',
'controller' => 'modo',
'action' => 'formulaires',
@@ -10,7 +10,8 @@ foreach ($this->articles as $article) {
true),
$article->getTitre(),
$article->numberOfFormulairesToValidate(),
- $article->numberOfFormulaires());
+ $article->numberOfFormulaires(),
+ $this->tagEditArticle($article));
}
echo '</ul>';
?>
\ No newline at end of file
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index 7b4272ab1e0..12f237f370a 100644
--- a/public/admin/css/global.css
+++ b/public/admin/css/global.css
@@ -938,4 +938,10 @@ div[id^="liste_picto_genre_"] {
.subview table#formulaires td:first-child {
border: none;
+}
+
+
+img.article_edit {
+ vertical-align: middle;
+ margin-left: 5px;
}
\ No newline at end of file
diff --git a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
index d3e6ecd2571..c3a6909e03a 100644
--- a/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
+++ b/tests/application/modules/admin/controllers/ModoControllerFormulaireTest.php
@@ -293,13 +293,19 @@ class ModoControllerFormulaireListTest extends Admin_AbstractControllerTestCase
/** @test */
public function liShouldContainsLinkToFormulaireForHackaton() {
- $this->assertXPathContentContains('//li/a[contains(@href,"admin/modo/formulaires/id_article/4")]', 'Inscrivez vous au Hackaton [2/2]', $this->_response->getBody());
+ $this->assertXPathContentContains('//li[1]/a[contains(@href,"admin/modo/formulaires/id_article/4")]', 'Inscrivez vous au Hackaton [2/2]', $this->_response->getBody());
+ }
+
+
+ /** @test */
+ public function liShouldContainsLinkToEditFormulaireHackaton() {
+ $this->assertXPath('//li[1]/a[contains(@href,"admin/cms/newsedit/id/4")]');
}
/** @test */
public function liShouldContainsLinkToFormulaireForPreinscription() {
- $this->assertXPathContentContains('//li/a[contains(@href,"admin/modo/formulaires/id_article/2")]', 'Formulaire de préinscription [1/4]');
+ $this->assertXPathContentContains('//li[2]/a[contains(@href,"admin/modo/formulaires/id_article/2")]', 'Formulaire de préinscription [1/4]');
}
}
--
GitLab