Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/117386
Change subject: Prevent proxy creation in read-only regions.
......................................................................
Prevent proxy creation in read-only regions.
Change-Id: Ia16e024eaa1f50b059c36f81b7f3f6f373996374
---
M special/SpecialNovaProxy.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/86/117386/1
diff --git a/special/SpecialNovaProxy.php b/special/SpecialNovaProxy.php
index b9bbba4..899ffa2 100644
--- a/special/SpecialNovaProxy.php
+++ b/special/SpecialNovaProxy.php
@@ -200,6 +200,7 @@
* @return void
*/
function listProxies() {
+ global $wgOpenStackManagerReadOnlyRegions;
$this->setHeaders();
$this->getOutput()->addModuleStyles( 'ext.openstack' );
$this->getOutput()->setPagetitle( $this->msg(
'openstackmanager-proxylist' ) );
@@ -227,7 +228,11 @@
$projectactions = array( 'projectadmin' => array() );
foreach ( $this->userNova->getRegions( 'proxy' ) as
$region ) {
$actions = array( 'projectadmin' => array() );
- $actions['projectadmin'][] =
$this->createActionLink( 'openstackmanager-createproxy', array( 'action' =>
'create', 'project' => $projectName, 'region' => $region ) );
+ if ( in_array( $region,
$wgOpenStackManagerReadOnlyRegions ) ) {
+ $actions['projectadmin'][] = array(
'projectadmin' => array( $this->msg( 'openstackmanager-creationdisabled' ) ) );
+ } else {
+ $actions['projectadmin'][] =
$this->createActionLink( 'openstackmanager-createproxy', array( 'action' =>
'create', 'project' => $projectName, 'region' => $region ) );
+ }
$regions .= $this->createRegionSection(
$region, $projectName, $actions, $this->getProxies( $projectName, $region ) );
}
$out .= $this->createProjectSection( $projectName,
$projectactions, $regions );
--
To view, visit https://gerrit.wikimedia.org/r/117386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16e024eaa1f50b059c36f81b7f3f6f373996374
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
