Page MenuHomePhabricator
Files F13247009

D15462.id37263.diff
No OneTemporary
Actions

D15462.id37263.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -421,7 +421,7 @@
'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
'rsrc/js/application/projects/WorkboardBoard.js' => '52291776',
'rsrc/js/application/projects/WorkboardCard.js' => 'c587b80f',
- 'rsrc/js/application/projects/WorkboardColumn.js' => 'f05d6e5d',
+ 'rsrc/js/application/projects/WorkboardColumn.js' => '44d1900c',
'rsrc/js/application/projects/WorkboardController.js' => '55baf5ed',
'rsrc/js/application/projects/behavior-project-boards.js' => '14a1faae',
'rsrc/js/application/projects/behavior-project-create.js' => '065227cc',
@@ -732,7 +732,7 @@
'javelin-websocket' => 'e292eaf4',
'javelin-workboard-board' => '52291776',
'javelin-workboard-card' => 'c587b80f',
- 'javelin-workboard-column' => 'f05d6e5d',
+ 'javelin-workboard-column' => '44d1900c',
'javelin-workboard-controller' => '55baf5ed',
'javelin-workflow' => '5b2e3e2b',
'lightbox-attachment-css' => '7acac05d',
@@ -1150,6 +1150,10 @@
'javelin-uri',
'javelin-install',
),
+ '44d1900c' => array(
+ 'javelin-install',
+ 'javelin-workboard-card',
+ ),
'453c5375' => array(
'javelin-behavior',
'javelin-dom',
@@ -2062,10 +2066,6 @@
'javelin-workflow',
'javelin-json',
),
- 'f05d6e5d' => array(
- 'javelin-install',
- 'javelin-workboard-card',
- ),
'f411b6ae' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -300,8 +300,18 @@
foreach ($visible_columns as $column_phid => $column) {
$column_tasks = $column_phids[$column_phid];
+ $header_nodes = array(
+ $column->getDisplayName(),
+ ' ',
+ javelin_tag(
+ 'span',
+ array(
+ 'sigil' => 'column-count',
+ )),
+ );
+
$panel = id(new PHUIWorkpanelView())
- ->setHeader($column->getDisplayName())
+ ->setHeader($header_nodes)
->setSubHeader($column->getDisplayType())
->addSigil('workpanel');
diff --git a/webroot/rsrc/js/application/projects/WorkboardColumn.js b/webroot/rsrc/js/application/projects/WorkboardColumn.js
--- a/webroot/rsrc/js/application/projects/WorkboardColumn.js
+++ b/webroot/rsrc/js/application/projects/WorkboardColumn.js
@@ -13,6 +13,7 @@
this._root = root;
this._panel = JX.DOM.findAbove(root, 'div', 'workpanel');
+ this._countNode = JX.DOM.find(this._panel, 'span', 'column-count');
this._pointsNode = JX.DOM.find(this._panel, 'span', 'column-points');
this._pointsContentNode = JX.DOM.find(
@@ -31,6 +32,7 @@
_cards: null,
_naturalOrder: null,
_panel: null,
+ _countNode: null,
_pointsNode: null,
_pointsContentNode: null,
_dirty: true,
@@ -60,6 +62,10 @@
return this;
},
+ getCountNode: function() {
+ return this._countNode;
+ },
+
getPointsNode: function() {
return this._pointsNode;
},
@@ -221,6 +227,7 @@
var board = this.getBoard();
var points = {};
+ var count = 0;
for (var phid in cards) {
var card = cards[phid];
@@ -238,6 +245,8 @@
}
points[status] += card_points;
}
+
+ count++;
}
var total_points = 0;
@@ -254,12 +263,21 @@
display_value = total_points;
}
+ var display_count;
+ if (count) {
+ display_count = '(' + count + ')';
+ } else {
+ display_count = '';
+ }
+
var over_limit = ((limit !== null) && (total_points > limit));
var content_node = this.getPointsContentNode();
var points_node = this.getPointsNode();
+ var count_node = this.getCountNode();
JX.DOM.setContent(content_node, display_value);
+ JX.DOM.setContent(count_node, display_count);
var is_empty = !this.getCardPHIDs().length;
var panel = JX.DOM.findAbove(this.getRoot(), 'div', 'workpanel');

File Metadata

Mime Type
text/plain
Expires
May 24 2024, 2:46 PM (4 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6307485
Default Alt Text
D15462.id37263.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility