Merge remote-tracking branch 'origin/v3' into v3-master

This commit is contained in:
snipe 2016-06-28 12:40:31 -07:00
commit 7c4b2caadf

View file

@ -51,10 +51,10 @@ class Statuslabel extends Model
return 'pending';
} elseif ($this->archived == 1) {
return 'archived';
} elseif (($this->archived == 0) && ($this->deployable == 0) && ($this->deployable == 0)) {
return 'undeployable';
} else {
} elseif ($this->deployable == 1) {
return 'deployable';
} else {
return 'undeployable';
}
}