Skip to content

Commit 1fa7eec

Browse files
bobfloatsroot
authored and
root
committed
Bug fixes to tags
1 parent bfc6f1f commit 1fa7eec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function getTags()
5757
public function createAnnotatedTag($version, $message, $commitShortCode = false )
5858
{
5959
if ($this->validateTagName($version)) {
60-
$command = sprintf('git tag -a %s -m "%s"', escapeshellarg($version), escapeshellarg($message));
60+
$command = sprintf('git tag -a %s -m %s', escapeshellarg($version), escapeshellarg($message));
6161
if($commitShortCode){
6262
$command .= ' '.escapeshellarg($commitShortCode);
6363
}

src/VersionControl/GitControlBundle/Controller/ProjectTagController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ public function tagsAction()
5858
*
5959
* @Route("/create/", name="project_tag")
6060
* @Method("POST")
61-
* @Template("VersionControlGitControlBundle:ProjectBranch:branches.html.twig")
61+
* @Template("VersionControlGitControlBundle:ProjectTag:tags.html.twig")
6262
* @ProjectAccess(grantType="EDIT")
6363
*/
6464
public function createTagAction(Request $request, $id)
6565
{
66-
$form = $this->createNewBranchForm($this->project);
66+
$form = $this->createNewTagForm($this->project);
6767
$form->handleRequest($request);
6868

6969
if ($form->isValid()) {
@@ -75,7 +75,7 @@ public function createTagAction(Request $request, $id)
7575
$response = $this->gitCommands->command('tag')->createAnnotatedTag($tagVersion, $tagMessage, $tagCommit);
7676
$this->get('session')->getFlashBag()->add('notice', $response);
7777

78-
return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
78+
return $this->redirect($this->generateUrl('project_tags', array('id' => $id)));
7979
} catch (\Exception $e) {
8080
$this->get('session')->getFlashBag()->add('error', $e->getMessage());
8181
}

src/VersionControl/GitControlBundle/Resources/views/ProjectTag/tags.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
</strong>
5959
</a>
6060
</div>
61-
<div class="col-md-8 col-lg-2">
61+
<div class="col-md-8 col-lg-3">
6262
<ul class="list-inline list-info">
6363
<li><i class="fa fa-user"></i> {{tag.taggerName}}</li>
64-
<li><i class="fa fa-calendar-o"></i> {{tag.taggerDate|date('h:m d-m-y')}}</li>
64+
<li><i class="fa fa-calendar-o"></i> {{tag.taggerDate|date('D jS M Y h:m A')}}</li>
6565
</ul>
6666
</div>
6767
<div class="col-md-8 col-lg-4">

0 commit comments

Comments
 (0)