diff --git a/application/modules/admin/views/scripts/redmine/edit-issue.phtml b/application/modules/admin/views/scripts/redmine/edit-issue.phtml index 21d88991d7491c4613cb82bd565e48bd80043dbc..275987e2a3aafe9528940ec209bf65f73c78ac2e 100644 --- a/application/modules/admin/views/scripts/redmine/edit-issue.phtml +++ b/application/modules/admin/views/scripts/redmine/edit-issue.phtml @@ -19,6 +19,15 @@ </tr> </table> </fieldset> + <fieldset> + <legend><?php echo $this->_('Pièces jointes');?></legend> + <table> + <tr> + <td></td> + <td class="gauche"><?php echo $this->redmine_IssueAttachments($this->issue); ?></td> + </tr> + </table> + </fieldset> <fieldset> <legend><?php echo $this->_('Historique');?></legend> <table> diff --git a/library/Class/WebService/Redmine.php b/library/Class/WebService/Redmine.php index ed88740746311da0a9f95a69a849e7236cfe73dd..89c41bab2b3117bea6b1facaf465967e778b1087 100644 --- a/library/Class/WebService/Redmine.php +++ b/library/Class/WebService/Redmine.php @@ -226,7 +226,7 @@ class Class_WebService_Redmine extends Class_WebService_Abstract { if (!$this->isValid() || !$ticket) return new Class_WebService_Redmine_Issue(); - $data = $this->getIssueApi()->show($ticket, ['include' => 'journals']); + $data = $this->getIssueApi()->show($ticket, ['include' => 'attachments,journals']); $issue = Class_WebService_Redmine_Issue::newWith(isset($data['issue']) ? $data['issue'] : []); $issue->setService($this); diff --git a/library/ZendAfi/View/Helper/Redmine/IssueAttachments.php b/library/ZendAfi/View/Helper/Redmine/IssueAttachments.php index 3dd1e72ebbe7cb0dd6e83aff857b8257b5fb0739..7602fe5bd84f66bd735d3a826e3912cc487f02c6 100644 --- a/library/ZendAfi/View/Helper/Redmine/IssueAttachments.php +++ b/library/ZendAfi/View/Helper/Redmine/IssueAttachments.php @@ -24,9 +24,16 @@ class ZendAfi_View_Helper_Redmine_IssueAttachments extends ZendAfi_View_Helper_B protected $_issue; public function Redmine_IssueAttachments($issue) { - if (!$issue || (!$attachements = $issue->getAttachments())) + if (!$issue || (!$attachements = $issue->getattachments())) return $this->_('Aucune pièce jointe'); - return ''; + $html = []; + foreach($attachements as $attachment) + $html [] = $this->_tag('li', + $issue->renderAttachment($this->view, (new Class_Entity($attachment)) + ->setnew_value($attachment['filename']) + ->setname($attachment['id']))); + + return $this->_tag('ul', implode($html)); } } \ No newline at end of file diff --git a/tests/application/modules/admin/controllers/RedmineControllerTest.php b/tests/application/modules/admin/controllers/RedmineControllerTest.php index a2ba00f1a7a0af0d014bce35f8f6d550ddd0c644..8fc8aab752b9f33ce46d06d934da9cbcde9c5f9c 100644 --- a/tests/application/modules/admin/controllers/RedmineControllerTest.php +++ b/tests/application/modules/admin/controllers/RedmineControllerTest.php @@ -294,7 +294,7 @@ class Admin_RedmineControllerIndexTest extends Admin_RedmineControllerWithApiTes /** @test */ public function anchorToEditBibsShouldBePresent() { - $this->assertXPath('//div[@class="modules"]//button[contains(@onclick, "admin/bib/edit/id/1/backUrl/")]'); + $this->assertXPath('//div[@class="modules"]//button[contains(@onclick, "admin/bib/edit/id/1?backUrl=")]'); } @@ -433,10 +433,10 @@ abstract class Admin_RedmineControllerFixtureAbstractTest extends Admin_RedmineC parent::setUp(); $redmine_api = $this->mock() - ->whenCalled('show')->with('34247', ['include' => 'journals']) + ->whenCalled('show')->with('34247', ['include' => 'attachments,journals']) ->answers(RedmineFixtures::issue34247WithJournals()) - ->whenCalled('show')->with('34248', ['include' => 'journals']) + ->whenCalled('show')->with('34248', ['include' => 'attachments,journals']) ->answers(RedmineFixtures::issue34248WithJournals()) ->whenCalled('update')->answers('hfg') @@ -653,7 +653,7 @@ class Admin_RedmineControllerPostEditIssue34247Test extends Admin_RedmineControl parent::setUp(); $redmine_api = $this->mock() - ->whenCalled('show')->with('34247', ['include' => 'journals']) + ->whenCalled('show')->with('34247', ['include' => 'attachments,journals']) ->answers(RedmineFixtures::issue34247WithJournals()) ->whenCalled('update')->answers('hfg') @@ -802,7 +802,7 @@ class Admin_RedmineControllerPostEditIssue34247WithAttachmentTest extends Admin_ $redmine_api = $this->mock() ->whenCalled('show') - ->with('34247', ['include' => 'journals']) + ->with('34247', ['include' => 'attachments,journals']) ->answers(RedmineFixtures::issue34247WithJournals()) ->whenCalled('update')