Page MenuHomePhabricator
Files F15261917

D19805.diff
No OneTemporary
Actions

D19805.diff
View Options

diff --git a/src/applications/herald/controller/HeraldDisableController.php b/src/applications/herald/controller/HeraldDisableController.php
--- a/src/applications/herald/controller/HeraldDisableController.php
+++ b/src/applications/herald/controller/HeraldDisableController.php
@@ -44,13 +44,13 @@
}
if ($is_disable) {
- $title = pht('Really archive this rule?');
+ $title = pht('Really disable this rule?');
$body = pht('This rule will no longer activate.');
- $button = pht('Archive Rule');
+ $button = pht('Disable Rule');
} else {
- $title = pht('Really activate this rule?');
+ $title = pht('Really enable this rule?');
$body = pht('This rule will become active again.');
- $button = pht('Activate Rule');
+ $button = pht('Enable Rule');
}
$dialog = id(new AphrontDialogView())
diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
--- a/src/applications/herald/controller/HeraldRuleViewController.php
+++ b/src/applications/herald/controller/HeraldRuleViewController.php
@@ -14,6 +14,7 @@
->setViewer($viewer)
->withIDs(array($id))
->needConditionsAndActions(true)
+ ->needValidateAuthors(true)
->executeOne();
if (!$rule) {
return new Aphront404Response();
@@ -26,15 +27,11 @@
->setHeaderIcon('fa-bullhorn');
if ($rule->getIsDisabled()) {
- $header->setStatus(
- 'fa-ban',
- 'red',
- pht('Archived'));
+ $header->setStatus('fa-ban', 'red', pht('Disabled'));
+ } else if (!$rule->hasValidAuthor()) {
+ $header->setStatus('fa-user', 'red', pht('Author Not Active'));
} else {
- $header->setStatus(
- 'fa-check',
- 'bluegrey',
- pht('Active'));
+ $header->setStatus('fa-check', 'bluegrey', pht('Active'));
}
$curtain = $this->buildCurtain($rule);
@@ -90,16 +87,15 @@
if ($rule->getIsDisabled()) {
$disable_uri = "disable/{$id}/enable/";
$disable_icon = 'fa-check';
- $disable_name = pht('Activate Rule');
+ $disable_name = pht('Enable Rule');
} else {
$disable_uri = "disable/{$id}/disable/";
$disable_icon = 'fa-ban';
- $disable_name = pht('Archive Rule');
+ $disable_name = pht('Disable Rule');
}
$curtain->addAction(
id(new PhabricatorActionView())
- ->setName(pht('Disable Rule'))
->setHref($this->getApplicationURI($disable_uri))
->setIcon($disable_icon)
->setName($disable_name)
diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php
--- a/src/applications/herald/query/HeraldRuleQuery.php
+++ b/src/applications/herald/query/HeraldRuleQuery.php
@@ -8,6 +8,7 @@
private $ruleTypes;
private $contentTypes;
private $disabled;
+ private $active;
private $datasourceQuery;
private $triggerObjectPHIDs;
@@ -45,6 +46,11 @@
return $this;
}
+ public function withActive($active) {
+ $this->active = $active;
+ return $this;
+ }
+
public function withDatasourceQuery($query) {
$this->datasourceQuery = $query;
return $this;
@@ -92,10 +98,31 @@
}
}
- if ($this->needValidateAuthors) {
+ if ($this->needValidateAuthors || ($this->active !== null)) {
$this->validateRuleAuthors($rules);
}
+ if ($this->active !== null) {
+ $need_active = (bool)$this->active;
+ foreach ($rules as $key => $rule) {
+ if ($rule->getIsDisabled()) {
+ $is_active = false;
+ } else if (!$rule->hasValidAuthor()) {
+ $is_active = false;
+ } else {
+ $is_active = true;
+ }
+
+ if ($is_active != $need_active) {
+ unset($rules[$key]);
+ }
+ }
+ }
+
+ if (!$rules) {
+ return array();
+ }
+
if ($this->needConditionsAndActions) {
$conditions = id(new HeraldCondition())->loadAllWhere(
'ruleID IN (%Ld)',
@@ -213,6 +240,13 @@
(int)$this->disabled);
}
+ if ($this->active !== null) {
+ $where[] = qsprintf(
+ $conn,
+ 'rule.isDisabled = %d',
+ (int)(!$this->active));
+ }
+
if ($this->datasourceQuery !== null) {
$where[] = qsprintf(
$conn,
diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
@@ -11,7 +11,8 @@
}
public function newQuery() {
- return new HeraldRuleQuery();
+ return id(new HeraldRuleQuery())
+ ->needValidateAuthors(true);
}
protected function buildCustomSearchFields() {
@@ -41,7 +42,14 @@
pht('Search for rules affecting given types of content.'))
->setOptions($content_types),
id(new PhabricatorSearchThreeStateField())
- ->setLabel(pht('Rule Status'))
+ ->setLabel(pht('Active Rules'))
+ ->setKey('active')
+ ->setOptions(
+ pht('(Show All)'),
+ pht('Show Only Active Rules'),
+ pht('Show Only Inactive Rules')),
+ id(new PhabricatorSearchThreeStateField())
+ ->setLabel(pht('Disabled Rules'))
->setKey('disabled')
->setOptions(
pht('(Show All)'),
@@ -69,6 +77,10 @@
$query->withDisabled($map['disabled']);
}
+ if ($map['active'] !== null) {
+ $query->withActive($map['active']);
+ }
+
return $query;
}
@@ -99,7 +111,8 @@
case 'all':
return $query;
case 'active':
- return $query->setParameter('disabled', false);
+ return $query
+ ->setParameter('active', true);
case 'authored':
return $query
->setParameter('authorPHIDs', array($viewer_phid))
@@ -145,6 +158,9 @@
if ($rule->getIsDisabled()) {
$item->setDisabled(true);
$item->addIcon('fa-lock grey', pht('Disabled'));
+ } else if (!$rule->hasValidAuthor()) {
+ $item->setDisabled(true);
+ $item->addIcon('fa-user grey', pht('Author Not Active'));
}
$content_type_name = idx($content_type_map, $rule->getContentType());

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 26, 10:27 AM (5 m, 21 s)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7207631
Default Alt Text
D19805.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility