@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | ->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members) |
| 775 | 775 | ->setTitle('Who can upload?') |
| 776 | 776 | ->setDescription( |
| 777 | - 'Users who can upload archives linked to this environment into Deploynaut.<br />' . |
|
| 777 | + 'Users who can upload archives linked to this environment into Deploynaut.<br />'. |
|
| 778 | 778 | 'Linking them to an environment allows limiting download permissions (see below).' |
| 779 | 779 | ), |
| 780 | 780 | |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | // Add actions |
| 822 | 822 | $action = new FormAction('check', 'Check Connection'); |
| 823 | 823 | $action->setUseButtonTag(true); |
| 824 | - $dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping'; |
|
| 824 | + $dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping'; |
|
| 825 | 825 | $action->setAttribute('data-url', $dataURL); |
| 826 | 826 | $fields->insertBefore($action, 'Name'); |
| 827 | 827 | |
@@ -834,8 +834,8 @@ discard block |
||
| 834 | 834 | */ |
| 835 | 835 | public function onBeforeWrite() { |
| 836 | 836 | parent::onBeforeWrite(); |
| 837 | - if ($this->Name && $this->Name . '.rb' != $this->Filename) { |
|
| 838 | - $this->Filename = $this->Name . '.rb'; |
|
| 837 | + if ($this->Name && $this->Name.'.rb' != $this->Filename) { |
|
| 838 | + $this->Filename = $this->Name.'.rb'; |
|
| 839 | 839 | } |
| 840 | 840 | $this->checkEnvironmentPath(); |
| 841 | 841 | $this->writeConfigFile(); |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | if (!$this->Filename) { |
| 886 | 886 | return ''; |
| 887 | 887 | } |
| 888 | - return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename; |
|
| 888 | + return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename; |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | /** |
@@ -1039,7 +1039,7 @@ discard block |
||
| 1039 | 1039 | && $this->Filename |
| 1040 | 1040 | && $this->CreateEnvConfig |
| 1041 | 1041 | ) { |
| 1042 | - $templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template'; |
|
| 1042 | + $templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template'; |
|
| 1043 | 1043 | file_put_contents($this->getConfigFilename(), file_get_contents($templateFile)); |
| 1044 | 1044 | } else if ($this->envFileExists() && $this->DeployConfig) { |
| 1045 | 1045 | file_put_contents($this->getConfigFilename(), $this->DeployConfig); |
@@ -82,6 +82,9 @@ |
||
| 82 | 82 | 'Deployer.Name' => 'Deployer' |
| 83 | 83 | ); |
| 84 | 84 | |
| 85 | + /** |
|
| 86 | + * @param false|string $token |
|
| 87 | + */ |
|
| 85 | 88 | public function setResqueToken($token) { |
| 86 | 89 | $this->ResqueToken = $token; |
| 87 | 90 | } |
@@ -263,12 +263,12 @@ |
||
| 263 | 263 | |
| 264 | 264 | // failover for older deployments |
| 265 | 265 | $started = $deployment->Created; |
| 266 | - if($deployment->DeployStarted) { |
|
| 266 | + if ($deployment->DeployStarted) { |
|
| 267 | 267 | $started = $deployment->DeployStarted; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | $requested = $deployment->Created; |
| 271 | - if($deployment->DeployRequested) { |
|
| 271 | + if ($deployment->DeployRequested) { |
|
| 272 | 272 | $requested = $deployment->DeployRequested; |
| 273 | 273 | } |
| 274 | 274 | |