AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Category label is broken on the board if there's a url in the description

Browse Source
This commit is contained in:
Frederic Guillot
2016-02-05 21:24:22 -05:00
parent 1bd96e8735
commit ffb8494fec
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -40,6 +40,7 @@ Improvements:
Bug fixes: Bug fixes:
* Category label is broken on the board if there's a url in the description
* Fix pagination on task time tracking page * Fix pagination on task time tracking page
Version 1.0.24 Version 1.0.24

2
app/Helper/Url.php
View File

@@ -44,7 +44,7 @@ class Url extends Base
*/ */
public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '') public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '')
{ {
return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor).'" class="'.$class.'" title="'.$title.'" '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>'; return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor).'" class="'.$class.'" title=\''.$title.'\' '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
} }
/** /**

6
tests/units/Helper/UrlHelperTest.php
View File

@@ -12,7 +12,7 @@ class UrlHelperTest extends Base
{ {
$h = new Url($this->container); $h = new Url($this->container);
$this->assertEquals( $this->assertEquals(
'<a href="?controller=a&amp;action=b&amp;d=e&amp;plugin=something" class="f" title="g" target="_blank">label</a>', '<a href="?controller=a&amp;action=b&amp;d=e&amp;plugin=something" class="f" title=\'g\' target="_blank">label</a>',
$h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true) $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true)
); );
} }
@@ -24,7 +24,7 @@ class UrlHelperTest extends Base
$h = new Url($this->container); $h = new Url($this->container);
$this->assertEquals( $this->assertEquals(
'<a href="myplugin/something/e" class="f" title="g" target="_blank">label</a>', '<a href="myplugin/something/e" class="f" title=\'g\' target="_blank">label</a>',
$h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true) $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true)
); );
} }
@@ -33,7 +33,7 @@ class UrlHelperTest extends Base
{ {
$h = new Url($this->container); $h = new Url($this->container);
$this->assertEquals( $this->assertEquals(
'<a href="?controller=a&amp;action=b&amp;d=e" class="f" title="g" target="_blank">label</a>', '<a href="?controller=a&amp;action=b&amp;d=e" class="f" title=\'g\' target="_blank">label</a>',
$h->link('label', 'a', 'b', array('d' => 'e'), false, 'f', 'g', true) $h->link('label', 'a', 'b', array('d' => 'e'), false, 'f', 'g', true)
); );
} }