Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53464
Change subject: (bug 45649) Fix exception when trying to configure instance
with wrong group
......................................................................
(bug 45649) Fix exception when trying to configure instance with wrong
group
Bug: 45649
Change-Id: I23b21b9d02db6bc5bf36544873704a95fe0b1e37
---
M special/SpecialNovaInstance.php
1 file changed, 10 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/64/53464/1
diff --git a/special/SpecialNovaInstance.php b/special/SpecialNovaInstance.php
index f14a386..c885fdf 100644
--- a/special/SpecialNovaInstance.php
+++ b/special/SpecialNovaInstance.php
@@ -265,14 +265,19 @@
$this->setHeaders();
- $project = $this->getRequest()->getText( 'project' );
$region = $this->getRequest()->getText( 'region' );
- if ( ! $this->userLDAP->inRole( 'projectadmin', $project ) ) {
+ $instanceosid = $this->getRequest()->getText( 'instanceid' );
+ $instance = $this->userNova->getInstance( $instanceosid );
+ if ( !$instance ) {
+ $this->getOutput()->addWikiMsg(
'openstackmanager-nonexistentresource' );
+ return false;
+ }
+
+ if ( !$this->userLDAP->inRole( 'projectadmin',
$instance->getProject() ) ) {
$this->notInRole( 'projectadmin' );
return false;
}
- $instanceosid = $this->getRequest()->getText( 'instanceid' );
- $instance = $this->userNova->getInstance( $instanceosid );
+
$instanceid = $instance->getInstanceId();
$instancename = $instance->getInstanceName();
$this->getOutput()->setPagetitle( $this->msg(
'openstackmanager-configureinstance', $instanceid, $instancename ) );
@@ -284,7 +289,7 @@
);
$instanceInfo['project'] = array(
'type' => 'hidden',
- 'default' => $project,
+ 'default' => $instance->getProject(),
'name' => 'project',
);
$instanceInfo['region'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/53464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23b21b9d02db6bc5bf36544873704a95fe0b1e37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
