Skip to content
This repository has been archived by the owner on Dec 15, 2018. It is now read-only.

Commit

Permalink
Fix diff-trigger and commit-trigger rendering
Browse files Browse the repository at this point in the history
Summary: This was wrong because both "1" and "0" cast to true.

Reviewers: kylec, paulruan

Reviewed By: paulruan

Subscribers: changesbot

Tags: #changes_ui

Differential Revision: https://tails.corp.dropbox.com/D223743
  • Loading branch information
ecnerwala committed Aug 26, 2016
1 parent b2c547f commit 565e936
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions webapp/pages/all_projects_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ var AllProjectsPage = React.createClass({

var repo_rows = _.map(repo_projects, (p, index) => {
var triggers = "Never";
if (p.options["phabricator.diff-trigger"] &&
p.options["build.commit-trigger"]) {
if (p.options["phabricator.diff-trigger"] === "1" &&
p.options["build.commit-trigger"] === "1") {
triggers = "Diffs and Commits";
} else if (p.options["phabricator.diff-trigger"]) {
} else if (p.options["phabricator.diff-trigger"] === "1") {
triggers = "Only Diffs";
} else if (p.options["build.commit-trigger"]) {
} else if (p.options["build.commit-trigger"] === "1") {
triggers = "Only Commits";
}

Expand Down
4 changes: 2 additions & 2 deletions webapp/pages/project_page/details_tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ var DetailsTab = React.createClass({
},

renderHeader: function(project, plans) {
var builds_on_diffs = project.options["phabricator.diff-trigger"];
var builds_on_commits = project.options["build.commit-trigger"];
var builds_on_diffs = project.options["phabricator.diff-trigger"] === "1";
var builds_on_commits = project.options["build.commit-trigger"] === "1";

var triggers = 'Does not automatically run';
if (builds_on_commits && builds_on_diffs) {
Expand Down

0 comments on commit 565e936

Please sign in to comment.