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

Fixed users tooltip in projects Gantt

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-13 22:44:30 -04:00
parent ae70f47cc1
commit d0da3f66d7
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Template/gantt/projects.php
View File

@@ -17,8 +17,8 @@
id="gantt-chart" id="gantt-chart"
data-records='<?= json_encode($projects, JSON_HEX_APOS) ?>' data-records='<?= json_encode($projects, JSON_HEX_APOS) ?>'
data-save-url="<?= $this->url->href('gantt', 'saveProjectDate') ?>" data-save-url="<?= $this->url->href('gantt', 'saveProjectDate') ?>"
data-label-managers="<?= t('Project managers') ?>" data-label-project-manager="<?= t('Project managers') ?>"
data-label-members="<?= t('Project members') ?>" data-label-project-member="<?= t('Project members') ?>"
data-label-gantt-link="<?= t('Gantt chart for this project') ?>" data-label-gantt-link="<?= t('Gantt chart for this project') ?>"
data-label-board-link="<?= t('Project board') ?>" data-label-board-link="<?= t('Project board') ?>"
data-label-start-date="<?= t('Start date:') ?>" data-label-start-date="<?= t('Start date:') ?>"

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

6
assets/js/src/Gantt.js
View File

@@ -232,7 +232,7 @@ Kanboard.Gantt.prototype.getVerticalHeaderTooltip = function(record) {
tooltip = "<strong>" + record.column_title + "</strong> (" + record.progress + ")<br/>" + record.title; tooltip = "<strong>" + record.column_title + "</strong> (" + record.progress + ")<br/>" + record.title;
} }
else { else {
var types = ["managers", "members"]; var types = ["project-manager", "project-member"];
for (var index in types) { for (var index in types) {
var type = types[index]; var type = types[index];
@@ -240,7 +240,9 @@ Kanboard.Gantt.prototype.getVerticalHeaderTooltip = function(record) {
var list = jQuery("<ul>"); var list = jQuery("<ul>");
for (var user_id in record.users[type]) { for (var user_id in record.users[type]) {
list.append(jQuery("<li>").append(record.users[type][user_id])); if (user_id) {
list.append(jQuery("<li>").append(record.users[type][user_id]));
}
} }
tooltip += "<p><strong>" + $(this.options.container).data("label-" + type) + "</strong></p>" + list[0].outerHTML; tooltip += "<p><strong>" + $(this.options.container).data("label-" + type) + "</strong></p>" + list[0].outerHTML;