|
@@ -311,10 +311,10 @@ discard block |
|
|
block discarded – undo |
|
311
|
311
|
} |
|
312
|
312
|
// Must be logged in to check permissions |
|
313
|
313
|
|
|
314
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
315
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true; |
|
|
314
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
315
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true; |
|
316
|
316
|
} else { |
|
317
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true; |
|
|
317
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true; |
|
318
|
318
|
} |
|
319
|
319
|
|
|
320
|
320
|
return $this->Deployers()->byID($member->ID) |
|
@@ -346,10 +346,10 @@ discard block |
|
|
block discarded – undo |
|
346
|
346
|
} |
|
347
|
347
|
// Must be logged in to check permissions |
|
348
|
348
|
|
|
349
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
350
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
|
349
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
350
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
351
|
351
|
} else { |
|
352
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
|
352
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
353
|
353
|
} |
|
354
|
354
|
|
|
355
|
355
|
return $this->CanRestoreMembers()->byID($member->ID) |
|
@@ -377,10 +377,10 @@ discard block |
|
|
block discarded – undo |
|
377
|
377
|
return false; |
|
378
|
378
|
} |
|
379
|
379
|
|
|
380
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
381
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
|
380
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
381
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
382
|
382
|
} else { |
|
383
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
|
383
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
384
|
384
|
} |
|
385
|
385
|
|
|
386
|
386
|
return $this->CanBackupMembers()->byID($member->ID) |
|
@@ -412,10 +412,10 @@ discard block |
|
|
block discarded – undo |
|
412
|
412
|
} |
|
413
|
413
|
// Must be logged in to check permissions |
|
414
|
414
|
|
|
415
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
416
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
|
415
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
416
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
417
|
417
|
} else { |
|
418
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
|
418
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
419
|
419
|
} |
|
420
|
420
|
|
|
421
|
421
|
return $this->ArchiveUploaders()->byID($member->ID) |
|
@@ -438,10 +438,10 @@ discard block |
|
|
block discarded – undo |
|
438
|
438
|
} |
|
439
|
439
|
// Must be logged in to check permissions |
|
440
|
440
|
|
|
441
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
442
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
|
441
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
442
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
443
|
443
|
} else { |
|
444
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
|
444
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
445
|
445
|
} |
|
446
|
446
|
|
|
447
|
447
|
return $this->ArchiveDownloaders()->byID($member->ID) |
|
@@ -464,10 +464,10 @@ discard block |
|
|
block discarded – undo |
|
464
|
464
|
} |
|
465
|
465
|
// Must be logged in to check permissions |
|
466
|
466
|
|
|
467
|
|
- if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
468
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
|
467
|
+ if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) { |
|
|
468
|
+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true; |
|
469
|
469
|
} else { |
|
470
|
|
- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
|
470
|
+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true; |
|
471
|
471
|
} |
|
472
|
472
|
|
|
473
|
473
|
return $this->ArchiveDeleters()->byID($member->ID) |
|
@@ -804,7 +804,7 @@ discard block |
|
|
block discarded – undo |
|
804
|
804
|
->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members) |
|
805
|
805
|
->setTitle('Who can upload?') |
|
806
|
806
|
->setDescription( |
|
807
|
|
- 'Users who can upload archives linked to this environment into Deploynaut.<br />' . |
|
|
807
|
+ 'Users who can upload archives linked to this environment into Deploynaut.<br />'. |
|
808
|
808
|
'Linking them to an environment allows limiting download permissions (see below).' |
|
809
|
809
|
), |
|
810
|
810
|
|
|
@@ -851,7 +851,7 @@ discard block |
|
|
block discarded – undo |
|
851
|
851
|
// Add actions |
|
852
|
852
|
$action = new FormAction('check', 'Check Connection'); |
|
853
|
853
|
$action->setUseButtonTag(true); |
|
854
|
|
- $dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping'; |
|
|
854
|
+ $dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping'; |
|
855
|
855
|
$action->setAttribute('data-url', $dataURL); |
|
856
|
856
|
$fields->insertBefore($action, 'Name'); |
|
857
|
857
|
|
|
@@ -888,8 +888,8 @@ discard block |
|
|
block discarded – undo |
|
888
|
888
|
*/ |
|
889
|
889
|
public function onBeforeWrite() { |
|
890
|
890
|
parent::onBeforeWrite(); |
|
891
|
|
- if($this->Name && $this->Name . '.rb' != $this->Filename) { |
|
892
|
|
- $this->Filename = $this->Name . '.rb'; |
|
|
891
|
+ if($this->Name && $this->Name.'.rb' != $this->Filename) { |
|
|
892
|
+ $this->Filename = $this->Name.'.rb'; |
|
893
|
893
|
} |
|
894
|
894
|
$this->checkEnvironmentPath(); |
|
895
|
895
|
$this->writeConfigFile(); |
|
@@ -936,7 +936,7 @@ discard block |
|
|
block discarded – undo |
|
936
|
936
|
&& $this->Filename |
|
937
|
937
|
&& $this->CreateEnvConfig |
|
938
|
938
|
) { |
|
939
|
|
- $templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template'; |
|
|
939
|
+ $templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template'; |
|
940
|
940
|
file_put_contents($this->getConfigFilename(), file_get_contents($templateFile)); |
|
941
|
941
|
} else if($this->envFileExists() && $this->DeployConfig) { |
|
942
|
942
|
file_put_contents($this->getConfigFilename(), $this->DeployConfig); |
|
@@ -991,7 +991,7 @@ discard block |
|
|
block discarded – undo |
|
991
|
991
|
if(!$this->Filename) { |
|
992
|
992
|
return ''; |
|
993
|
993
|
} |
|
994
|
|
- return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename; |
|
|
994
|
+ return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename; |
|
995
|
995
|
} |
|
996
|
996
|
|
|
997
|
997
|
/** |