diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -395,7 +395,7 @@ 'rsrc/js/application/herald/PathTypeahead.js' => 'ad486db3', 'rsrc/js/application/herald/herald-rule-editor.js' => '0922e81d', 'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'cffd39b4', - 'rsrc/js/application/maniphest/behavior-line-chart.js' => '3e9da12d', + 'rsrc/js/application/maniphest/behavior-line-chart.js' => 'c8147a20', 'rsrc/js/application/maniphest/behavior-list-edit.js' => 'c687e867', 'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '8400307c', 'rsrc/js/application/owners/OwnersPathEditor.js' => '2a8b62d9', @@ -614,7 +614,7 @@ 'javelin-behavior-icon-composer' => '38a6cedb', 'javelin-behavior-launch-icon-composer' => 'a17b84f1', 'javelin-behavior-lightbox-attachments' => 'c7e748bf', - 'javelin-behavior-line-chart' => '3e9da12d', + 'javelin-behavior-line-chart' => 'c8147a20', 'javelin-behavior-linked-container' => '74446546', 'javelin-behavior-maniphest-batch-selector' => 'cffd39b4', 'javelin-behavior-maniphest-list-editor' => 'c687e867', @@ -1200,12 +1200,6 @@ 'javelin-vector', 'javelin-dom', ), - '3e9da12d' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-vector', - 'phui-chart-css', - ), '3eed1f2b' => array( 'javelin-behavior', 'javelin-stratcom', @@ -1950,6 +1944,12 @@ 'phuix-icon-view', 'phabricator-busy', ), + 'c8147a20' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-vector', + 'phui-chart-css', + ), 'c9749dcd' => array( 'javelin-install', 'javelin-util', diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -74,8 +74,6 @@ $table = new ManiphestTransaction(); $conn = $table->establishConnection('r'); - $joins = ''; - $create_joins = ''; if ($project_phid) { $joins = qsprintf( $conn, @@ -91,6 +89,9 @@ PhabricatorEdgeConfig::TABLE_NAME_EDGE, PhabricatorProjectObjectHasProjectEdgeType::EDGECONST, $project_phid); + } else { + $joins = qsprintf($conn, ''); + $create_joins = qsprintf($conn, ''); } $data = queryfx_all( diff --git a/webroot/rsrc/js/application/maniphest/behavior-line-chart.js b/webroot/rsrc/js/application/maniphest/behavior-line-chart.js --- a/webroot/rsrc/js/application/maniphest/behavior-line-chart.js +++ b/webroot/rsrc/js/application/maniphest/behavior-line-chart.js @@ -107,7 +107,10 @@ .attr('cy', function(d) { return y(d.count); }) .on('mouseover', function(d) { var d_y = d.date.getFullYear(); - var d_m = d.date.getMonth(); + + // NOTE: Javascript months are zero-based. See PHI1017. + var d_m = d.date.getMonth() + 1; + var d_d = d.date.getDate(); div