tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Url::getRelativeUrl() when updating dashlets 

fixes #8363
This commit is contained in:
Eric Lippmann 2015-04-07 13:05:12 +02:00
parent e32eeb991e
commit cdd5da80f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/forms/Dashboard/DashletForm.php
View File

@ -148,9 +148,9 @@ class DashletForm extends Form
$this->populate(array(
'pane' => $dashlet->getPane()->getName(),
'org_pane' => $dashlet->getPane()->getName(),
'dashlet' => $dashlet->getTitle(),
'org_dashlet' => $dashlet->getTitle(),
'url' => $dashlet->getUrl()
'dashlet' => $dashlet->getTitle(),
'org_dashlet' => $dashlet->getTitle(),
'url' => $dashlet->getUrl()->getRelativeUrl()
));
}
}

6
application/views/scripts/dashboard/settings.phtml
View File

@ -55,8 +55,8 @@
</td>
<td style="table-layout: fixed; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
<?= $this->qlink(
$dashlet->getUrl(),
$dashlet->getUrl(),
$dashlet->getUrl()->getRelativeUrl(),
$dashlet->getUrl()->getRelativeUrl(),
null,
array('title' => sprintf($this->translate('Show dashlet %s'), $dashlet->getTitle()))
); ?>
@ -78,4 +78,4 @@
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>