Page MenuHomePhabricator
Files F15413130

D11743.diff
No OneTemporary
Actions

D11743.diff
View Options

diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -40,25 +40,25 @@
$this->executeChecks();
}
- final public static function getOpenSetupIssueCount() {
+ final public static function getOpenSetupIssueKeys() {
$cache = PhabricatorCaches::getSetupCache();
- return $cache->getKey('phabricator.setup.issues');
+ return $cache->getKey('phabricator.setup.issue-keys');
}
- final public static function setOpenSetupIssueCount($count) {
+ final public static function setOpenSetupIssueKeys(array $keys) {
$cache = PhabricatorCaches::getSetupCache();
- $cache->setKey('phabricator.setup.issues', $count);
+ $cache->setKey('phabricator.setup.issue-keys', $keys);
}
- final public static function countUnignoredIssues(array $all_issues) {
+ final public static function getUnignoredIssueKeys(array $all_issues) {
assert_instances_of($all_issues, 'PhabricatorSetupIssue');
- $count = 0;
+ $keys = array();
foreach ($all_issues as $issue) {
if (!$issue->getIsIgnored()) {
- $count++;
+ $keys[] = $issue->getIssueKey();
}
}
- return $count;
+ return $keys;
}
final public static function getConfigNeedsRepair() {
@@ -76,13 +76,13 @@
$cache->deleteKeys(
array(
'phabricator.setup.needs-repair',
- 'phabricator.setup.issues',
+ 'phabricator.setup.issue-keys',
));
}
final public static function willProcessRequest() {
- $issue_count = self::getOpenSetupIssueCount();
- if ($issue_count === null) {
+ $issue_keys = self::getOpenSetupIssueKeys();
+ if ($issue_keys === null) {
$issues = self::runAllChecks();
foreach ($issues as $issue) {
if ($issue->getIsFatal()) {
@@ -92,7 +92,7 @@
->setView($view);
}
}
- self::setOpenSetupIssueCount(self::countUnignoredIssues($issues));
+ self::setOpenSetupIssueKeys(self::getUnignoredIssueKeys($issues));
}
// Try to repair configuration unless we have a clean bill of health on it.
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -11,8 +11,8 @@
$nav->selectFilter('issue/');
$issues = PhabricatorSetupCheck::runAllChecks();
- PhabricatorSetupCheck::setOpenSetupIssueCount(
- PhabricatorSetupCheck::countUnignoredIssues($issues));
+ PhabricatorSetupCheck::setOpenSetupIssueKeys(
+ PhabricatorSetupCheck::getUnignoredIssueKeys($issues));
$important = $this->buildIssueList(
$issues, PhabricatorSetupCheck::GROUP_IMPORTANT);
diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
--- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
@@ -14,8 +14,8 @@
$user = $request->getUser();
$issues = PhabricatorSetupCheck::runAllChecks();
- PhabricatorSetupCheck::setOpenSetupIssueCount(
- PhabricatorSetupCheck::countUnignoredIssues($issues));
+ PhabricatorSetupCheck::setOpenSetupIssueKeys(
+ PhabricatorSetupCheck::getUnignoredIssueKeys($issues));
if (empty($issues[$this->issueKey])) {
$content = id(new PHUIErrorView())
diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
@@ -46,7 +46,7 @@
true,
$content);
- $issues_resolved = !PhabricatorSetupCheck::getOpenSetupIssueCount();
+ $issues_resolved = !PhabricatorSetupCheck::getOpenSetupIssueKeys();
$setup_href = PhabricatorEnv::getURI('/config/issue/');
if ($issues_resolved) {
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -335,7 +335,7 @@
// Render the "you have unresolved setup issues..." warning.
$setup_warning = null;
if ($user && $user->getIsAdmin()) {
- $open = PhabricatorSetupCheck::getOpenSetupIssueCount();
+ $open = PhabricatorSetupCheck::getOpenSetupIssueKeys();
if ($open) {
$setup_warning = phutil_tag_div(
'setup-warning-callout',
@@ -343,8 +343,9 @@
'a',
array(
'href' => '/config/issue/',
+ 'title' => implode(', ', $open),
),
- pht('You have %d unresolved setup issue(s)...', $open)));
+ pht('You have %d unresolved setup issue(s)...', count($open))));
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 5:06 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7658310
Default Alt Text
D11743.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility