Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352973 )
Change subject: Prevent a few errors noticed in production
......................................................................
Prevent a few errors noticed in production
Change-Id: Ibbb16e7408890408a235d2d94383ae7ec7a997bf
---
M nova/OpenStackNovaProject.php
M special/SpecialNovaServiceGroup.php
2 files changed, 4 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/73/352973/1
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index f1e873a..a80514d 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -26,6 +26,7 @@
public $roles;
public $userrole;
public $loaded;
+ public $serviceGroups;
public $serviceUsers;
// list of roles that are visible in the web UI
@@ -94,8 +95,6 @@
* @return void
*/
function fetchProjectInfo( $refresh=true ) {
- global $wgOpenStackManagerLDAPProjectBaseDN;
-
if ( $this->loaded and !$refresh ) {
return;
}
@@ -184,6 +183,7 @@
* @return array
*/
function getServiceGroups() {
+ $this->fetchServiceGroups();
return $this->serviceGroups;
}
@@ -192,6 +192,7 @@
* @return array
*/
function getServiceUsers() {
+ $this->fetchServiceGroups();
return $this->serviceUsers;
}
diff --git a/special/SpecialNovaServiceGroup.php
b/special/SpecialNovaServiceGroup.php
index 123f877..cab9622 100644
--- a/special/SpecialNovaServiceGroup.php
+++ b/special/SpecialNovaServiceGroup.php
@@ -66,6 +66,7 @@
}
}
$servicemembers = $project->getServiceUsers();
+ $servicemember_keys = array();
foreach ( $servicemembers as $servicemember ) {
$servicemember_keys[$servicemember] =
$servicemember;
if ( in_array( $servicemember, $groupmembers )
) {
--
To view, visit https://gerrit.wikimedia.org/r/352973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbb16e7408890408a235d2d94383ae7ec7a997bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
