| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -86,6 +86,7 @@ |
| 87 | 87 | 'validation-callback' => array( $this, 'validateInstanceName' ), |
| 88 | 88 | 'default' => '', |
| 89 | 89 | 'section' => 'instance/info', |
| | 90 | + 'name' => 'instancename', |
| 90 | 91 | ); |
| 91 | 92 | |
| 92 | 93 | $instanceTypes = $this->adminNova->getInstanceTypes(); |
| — | — | @@ -103,6 +104,7 @@ |
| 104 | 105 | 'label-message' => 'openstackmanager-instancetype', |
| 105 | 106 | 'section' => 'instance/info', |
| 106 | 107 | 'options' => $instanceType_keys, |
| | 108 | + 'name' => 'instanceType', |
| 107 | 109 | ); |
| 108 | 110 | |
| 109 | 111 | # Availability zone names can't be translated. Get the keys, and make an array |
| — | — | @@ -117,6 +119,7 @@ |
| 118 | 120 | 'section' => 'instance/info', |
| 119 | 121 | 'options' => $availabilityZone_keys, |
| 120 | 122 | 'label-message' => 'openstackmanager-availabilityzone', |
| | 123 | + 'name' => 'availabilityZone', |
| 121 | 124 | ); |
| 122 | 125 | |
| 123 | 126 | # Image names can't be translated. Get the image, and make an array |
| — | — | @@ -145,6 +148,7 @@ |
| 146 | 149 | 'section' => 'instance/info', |
| 147 | 150 | 'options' => $image_keys, |
| 148 | 151 | 'label-message' => 'openstackmanager-imagetype', |
| | 152 | + 'name' => 'imageType', |
| 149 | 153 | ); |
| 150 | 154 | |
| 151 | 155 | # Keypair names can't be translated. Get the keys, and make an array |
| — | — | @@ -173,6 +177,7 @@ |
| 174 | 178 | 'section' => 'instance/info', |
| 175 | 179 | 'options' => $domain_keys, |
| 176 | 180 | 'label-message' => 'openstackmanager-dnsdomain', |
| | 181 | + 'name' => 'domain', |
| 177 | 182 | ); |
| 178 | 183 | |
| 179 | 184 | $securityGroups = $this->adminNova->getSecurityGroups(); |
| — | — | @@ -188,11 +193,13 @@ |
| 189 | 194 | 'section' => 'instance/info', |
| 190 | 195 | 'options' => $group_keys, |
| 191 | 196 | 'label-message' => 'openstackmanager-securitygroups', |
| | 197 | + 'name' => 'groups', |
| 192 | 198 | ); |
| 193 | 199 | |
| 194 | 200 | $instanceInfo['project'] = array( |
| 195 | 201 | 'type' => 'hidden', |
| 196 | 202 | 'default' => $project, |
| | 203 | + 'name' => 'project', |
| 197 | 204 | ); |
| 198 | 205 | |
| 199 | 206 | if ( $wgOpenStackManagerPuppetOptions['enabled'] ) { |
| — | — | @@ -206,6 +213,7 @@ |
| 207 | 214 | 'section' => 'instance/puppetinfo', |
| 208 | 215 | 'options' => $classes, |
| 209 | 216 | 'label-message' => 'openstackmanager-puppetclasses', |
| | 217 | + 'name' => 'puppetclasses', |
| 210 | 218 | ); |
| 211 | 219 | } |
| 212 | 220 | |
| — | — | @@ -215,6 +223,7 @@ |
| 216 | 224 | 'type' => 'text', |
| 217 | 225 | 'section' => 'instance/puppetinfo', |
| 218 | 226 | 'label' => $variable, |
| | 227 | + 'name' => "$variable", |
| 219 | 228 | ); |
| 220 | 229 | } |
| 221 | 230 | } |
| — | — | @@ -223,6 +232,7 @@ |
| 224 | 233 | $instanceInfo['action'] = array( |
| 225 | 234 | 'type' => 'hidden', |
| 226 | 235 | 'default' => 'create', |
| | 236 | + 'name' => 'action', |
| 227 | 237 | ); |
| 228 | 238 | |
| 229 | 239 | $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| — | — | @@ -231,6 +241,7 @@ |
| 232 | 242 | $instanceForm->setSubmitCallback( array( $this, 'tryCreateSubmit' ) ); |
| 233 | 243 | $instanceForm->show(); |
| 234 | 244 | |
| | 245 | + return true; |
| 235 | 246 | } |
| 236 | 247 | |
| 237 | 248 | /** |
| — | — | @@ -253,10 +264,12 @@ |
| 254 | 265 | $instanceInfo['instanceid'] = array( |
| 255 | 266 | 'type' => 'hidden', |
| 256 | 267 | 'default' => $instanceid, |
| | 268 | + 'name' => 'instanceid', |
| 257 | 269 | ); |
| 258 | 270 | $instanceInfo['project'] = array( |
| 259 | 271 | 'type' => 'hidden', |
| 260 | 272 | 'default' => $project, |
| | 273 | + 'name' => 'project', |
| 261 | 274 | ); |
| 262 | 275 | |
| 263 | 276 | if ( $wgOpenStackManagerPuppetOptions['enabled'] ) { |
| — | — | @@ -282,6 +295,7 @@ |
| 283 | 296 | 'options' => $classes, |
| 284 | 297 | 'default' => $defaults, |
| 285 | 298 | 'label-message' => 'openstackmanager-puppetclasses', |
| | 299 | + 'name' => 'puppetclasses', |
| 286 | 300 | ); |
| 287 | 301 | } |
| 288 | 302 | |
| — | — | @@ -296,6 +310,7 @@ |
| 297 | 311 | 'section' => 'instance/puppetinfo', |
| 298 | 312 | 'label' => $variable, |
| 299 | 313 | 'default' => $default, |
| | 314 | + 'name' => "$variable", |
| 300 | 315 | ); |
| 301 | 316 | } |
| 302 | 317 | } |
| — | — | @@ -304,6 +319,7 @@ |
| 305 | 320 | $instanceInfo['action'] = array( |
| 306 | 321 | 'type' => 'hidden', |
| 307 | 322 | 'default' => 'configure', |
| | 323 | + 'name' => 'action', |
| 308 | 324 | ); |
| 309 | 325 | |
| 310 | 326 | $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| — | — | @@ -337,14 +353,17 @@ |
| 338 | 354 | $instanceInfo['instanceid'] = array( |
| 339 | 355 | 'type' => 'hidden', |
| 340 | 356 | 'default' => $instanceid, |
| | 357 | + 'name' => 'instanceid', |
| 341 | 358 | ); |
| 342 | 359 | $instanceInfo['project'] = array( |
| 343 | 360 | 'type' => 'hidden', |
| 344 | 361 | 'default' => $project, |
| | 362 | + 'name' => 'project', |
| 345 | 363 | ); |
| 346 | 364 | $instanceInfo['action'] = array( |
| 347 | 365 | 'type' => 'hidden', |
| 348 | 366 | 'default' => 'delete', |
| | 367 | + 'name' => 'action', |
| 349 | 368 | ); |
| 350 | 369 | $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| 351 | 370 | $instanceForm->setTitle( SpecialPage::getTitleFor( 'NovaInstance' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php |
| — | — | @@ -62,20 +62,24 @@ |
| 63 | 63 | 'type' => 'text', |
| 64 | 64 | 'label-message' => 'openstackmanager-securitygroupname', |
| 65 | 65 | 'default' => '', |
| | 66 | + 'name' => 'groupname', |
| 66 | 67 | ); |
| 67 | 68 | $securityGroupInfo['description'] = array( |
| 68 | 69 | 'type' => 'text', |
| 69 | 70 | 'label-message' => 'openstackmanager-securitygroupdescription', |
| 70 | 71 | 'default' => '', |
| | 72 | + 'name' => 'description', |
| 71 | 73 | ); |
| 72 | 74 | $securityGroupInfo['project'] = array( |
| 73 | 75 | 'type' => 'hidden', |
| 74 | 76 | 'default' => $project, |
| | 77 | + 'name' => 'project', |
| 75 | 78 | ); |
| 76 | 79 | |
| 77 | 80 | $securityGroupInfo['action'] = array( |
| 78 | 81 | 'type' => 'hidden', |
| 79 | 82 | 'default' => 'create', |
| | 83 | + 'name' => 'action', |
| 80 | 84 | ); |
| 81 | 85 | |
| 82 | 86 | $securityGroupForm = new SpecialNovaSecurityGroupForm( $securityGroupInfo, 'openstackmanager-novasecuritygroup' ); |
| — | — | @@ -110,20 +114,24 @@ |
| 111 | 115 | $securityGroupInfo['groupname'] = array( |
| 112 | 116 | 'type' => 'hidden', |
| 113 | 117 | 'default' => $securitygroupname, |
| | 118 | + 'name' => 'groupname', |
| 114 | 119 | ); |
| 115 | 120 | $securityGroupInfo['description'] = array( |
| 116 | 121 | 'type' => 'text', |
| 117 | 122 | 'label-message' => 'openstackmanager-securitygroupdescription', |
| 118 | 123 | 'default' => $description, |
| | 124 | + 'name' => 'description', |
| 119 | 125 | ); |
| 120 | 126 | $securityGroupInfo['project'] = array( |
| 121 | 127 | 'type' => 'hidden', |
| 122 | 128 | 'default' => $project, |
| | 129 | + 'name' => 'project', |
| 123 | 130 | ); |
| 124 | 131 | |
| 125 | 132 | $securityGroupInfo['action'] = array( |
| 126 | 133 | 'type' => 'hidden', |
| 127 | 134 | 'default' => 'configure', |
| | 135 | + 'name' => 'action', |
| 128 | 136 | ); |
| 129 | 137 | |
| 130 | 138 | $securityGroupForm = new SpecialNovaSecurityGroupForm( $securityGroupInfo, 'openstackmanager-novasecuritygroup' ); |
| — | — | @@ -158,14 +166,17 @@ |
| 159 | 167 | $securityGroupInfo['groupname'] = array( |
| 160 | 168 | 'type' => 'hidden', |
| 161 | 169 | 'default' => $securitygroupname, |
| | 170 | + 'name' => 'groupname', |
| 162 | 171 | ); |
| 163 | 172 | $securityGroupInfo['project'] = array( |
| 164 | 173 | 'type' => 'hidden', |
| 165 | 174 | 'default' => $project, |
| | 175 | + 'name' => 'project', |
| 166 | 176 | ); |
| 167 | 177 | $securityGroupInfo['action'] = array( |
| 168 | 178 | 'type' => 'hidden', |
| 169 | 179 | 'default' => 'delete', |
| | 180 | + 'name' => 'action', |
| 170 | 181 | ); |
| 171 | 182 | $securityGroupForm = new SpecialNovaSecurityGroupForm( $securityGroupInfo, 'openstackmanager-novasecuritygroup' ); |
| 172 | 183 | $securityGroupForm->setTitle( SpecialPage::getTitleFor( 'NovaSecurityGroup' ) ); |
| — | — | @@ -332,41 +343,49 @@ |
| 333 | 344 | $securityGroupInfo['groupname'] = array( |
| 334 | 345 | 'type' => 'hidden', |
| 335 | 346 | 'default' => $securitygroupname, |
| | 347 | + 'name' => 'groupname', |
| 336 | 348 | ); |
| 337 | 349 | $securityGroupInfo['project'] = array( |
| 338 | 350 | 'type' => 'hidden', |
| 339 | 351 | 'default' => $project, |
| | 352 | + 'name' => 'project', |
| 340 | 353 | ); |
| 341 | 354 | $securityGroupInfo['fromport'] = array( |
| 342 | 355 | 'type' => 'text', |
| 343 | 356 | 'label-message' => 'openstackmanager-securitygrouprule-fromport', |
| 344 | 357 | 'default' => '', |
| | 358 | + 'name' => 'fromport', |
| 345 | 359 | ); |
| 346 | 360 | $securityGroupInfo['toport'] = array( |
| 347 | 361 | 'type' => 'text', |
| 348 | 362 | 'label-message' => 'openstackmanager-securitygrouprule-toport', |
| 349 | 363 | 'default' => '', |
| | 364 | + 'name' => 'toport', |
| 350 | 365 | ); |
| 351 | 366 | $securityGroupInfo['protocol'] = array( |
| 352 | 367 | 'type' => 'select', |
| 353 | 368 | 'label-message' => 'openstackmanager-securitygrouprule-protocol', |
| 354 | 369 | 'options' => array( '' => '', 'icmp' => 'icmp', 'tcp' => 'tcp', 'udp' => 'udp' ), |
| | 370 | + 'name' => 'protocol', |
| 355 | 371 | ); |
| 356 | 372 | $securityGroupInfo['ranges'] = array( |
| 357 | 373 | 'type' => 'text', |
| 358 | 374 | 'label-message' => 'openstackmanager-securitygrouprule-ranges', |
| 359 | 375 | 'help-message' => 'openstackmanager-securitygrouprule-ranges-help', |
| 360 | 376 | 'default' => '', |
| | 377 | + 'name' => 'ranges', |
| 361 | 378 | ); |
| 362 | 379 | $securityGroupInfo['groups'] = array( |
| 363 | 380 | 'type' => 'multiselect', |
| 364 | 381 | 'label-message' => 'openstackmanager-securitygrouprule-groups', |
| 365 | 382 | 'help-message' => 'openstackmanager-securitygrouprule-groups-help', |
| 366 | 383 | 'options' => $group_keys, |
| | 384 | + 'name' => 'groups', |
| 367 | 385 | ); |
| 368 | 386 | $securityGroupInfo['action'] = array( |
| 369 | 387 | 'type' => 'hidden', |
| 370 | 388 | 'default' => 'addrule', |
| | 389 | + 'name' => 'action', |
| 371 | 390 | ); |
| 372 | 391 | $securityGroupForm = new SpecialNovaSecurityGroupForm( $securityGroupInfo, 'openstackmanager-novasecuritygroup' ); |
| 373 | 392 | $securityGroupForm->setTitle( SpecialPage::getTitleFor( 'NovaSecurityGroup' ) ); |
| — | — | @@ -399,38 +418,46 @@ |
| 400 | 419 | $securityGroupInfo['groupname'] = array( |
| 401 | 420 | 'type' => 'hidden', |
| 402 | 421 | 'default' => $securitygroupname, |
| | 422 | + 'name' => 'groupname', |
| 403 | 423 | ); |
| 404 | 424 | $securityGroupInfo['project'] = array( |
| 405 | 425 | 'type' => 'hidden', |
| 406 | 426 | 'default' => $project, |
| | 427 | + 'name' => 'project', |
| 407 | 428 | ); |
| 408 | 429 | $securityGroupInfo['fromport'] = array( |
| 409 | 430 | 'type' => 'hidden', |
| 410 | 431 | 'default' => $wgRequest->getText( 'fromport' ), |
| | 432 | + 'name' => 'fromport', |
| 411 | 433 | ); |
| 412 | 434 | $securityGroupInfo['toport'] = array( |
| 413 | 435 | 'type' => 'hidden', |
| 414 | 436 | 'default' => $wgRequest->getText( 'toport' ), |
| | 437 | + 'name' => 'toport', |
| 415 | 438 | ); |
| 416 | 439 | $securityGroupInfo['protocol'] = array( |
| 417 | 440 | 'type' => 'hidden', |
| 418 | 441 | 'default' => $wgRequest->getText( 'protocol' ), |
| | 442 | + 'name' => 'protocol', |
| 419 | 443 | ); |
| 420 | 444 | if ( $wgRequest->getText( 'ranges' ) ) { |
| 421 | 445 | $securityGroupInfo['ranges'] = array( |
| 422 | 446 | 'type' => 'hidden', |
| 423 | 447 | 'default' => $wgRequest->getText( 'ranges' ), |
| | 448 | + 'name' => 'ranges', |
| 424 | 449 | ); |
| 425 | 450 | } |
| 426 | 451 | if ( $wgRequest->getText( 'groups' ) ) { |
| 427 | 452 | $securityGroupInfo['groups'] = array( |
| 428 | 453 | 'type' => 'hidden', |
| 429 | 454 | 'default' => $wgRequest->getText( 'groups' ), |
| | 455 | + 'name' => 'groups', |
| 430 | 456 | ); |
| 431 | 457 | } |
| 432 | 458 | $securityGroupInfo['action'] = array( |
| 433 | 459 | 'type' => 'hidden', |
| 434 | 460 | 'default' => 'removerule', |
| | 461 | + 'name' => 'action', |
| 435 | 462 | ); |
| 436 | 463 | $securityGroupForm = new SpecialNovaSecurityGroupForm( $securityGroupInfo, 'openstackmanager-novasecuritygroup' ); |
| 437 | 464 | $securityGroupForm->setTitle( SpecialPage::getTitleFor( 'NovaSecurityGroup' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php |
| — | — | @@ -67,10 +67,12 @@ |
| 68 | 68 | $addressInfo['project'] = array( |
| 69 | 69 | 'type' => 'hidden', |
| 70 | 70 | 'default' => $project, |
| | 71 | + 'name' => 'project', |
| 71 | 72 | ); |
| 72 | 73 | $addressInfo['action'] = array( |
| 73 | 74 | 'type' => 'hidden', |
| 74 | 75 | 'default' => 'allocate', |
| | 76 | + 'name' => 'action', |
| 75 | 77 | ); |
| 76 | 78 | |
| 77 | 79 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| — | — | @@ -106,14 +108,17 @@ |
| 107 | 109 | $addressInfo['project'] = array( |
| 108 | 110 | 'type' => 'hidden', |
| 109 | 111 | 'default' => $project, |
| | 112 | + 'name' => 'project', |
| 110 | 113 | ); |
| 111 | 114 | $addressInfo['ip'] = array( |
| 112 | 115 | 'type' => 'hidden', |
| 113 | 116 | 'default' => $ip, |
| | 117 | + 'name' => 'ip', |
| 114 | 118 | ); |
| 115 | 119 | $addressInfo['action'] = array( |
| 116 | 120 | 'type' => 'hidden', |
| 117 | 121 | 'default' => 'release', |
| | 122 | + 'name' => 'action', |
| 118 | 123 | ); |
| 119 | 124 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| 120 | 125 | $addressForm->setTitle( SpecialPage::getTitleFor( 'NovaAddress' ) ); |
| — | — | @@ -155,19 +160,23 @@ |
| 156 | 161 | $addressInfo['project'] = array( |
| 157 | 162 | 'type' => 'hidden', |
| 158 | 163 | 'default' => $project, |
| | 164 | + 'name' => 'project', |
| 159 | 165 | ); |
| 160 | 166 | $addressInfo['ip'] = array( |
| 161 | 167 | 'type' => 'hidden', |
| 162 | 168 | 'default' => $ip, |
| | 169 | + 'name' => 'ip', |
| 163 | 170 | ); |
| 164 | 171 | $addressInfo['instanceid'] = array( |
| 165 | 172 | 'type' => 'select', |
| 166 | 173 | 'label-message' => 'openstackmanager-instancename', |
| 167 | 174 | 'options' => $instance_keys, |
| | 175 | + 'name' => 'instanceid', |
| 168 | 176 | ); |
| 169 | 177 | $addressInfo['action'] = array( |
| 170 | 178 | 'type' => 'hidden', |
| 171 | 179 | 'default' => 'associate', |
| | 180 | + 'name' => 'action', |
| 172 | 181 | ); |
| 173 | 182 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| 174 | 183 | $addressForm->setTitle( SpecialPage::getTitleFor( 'NovaAddress' ) ); |
| — | — | @@ -202,14 +211,17 @@ |
| 203 | 212 | $addressInfo['project'] = array( |
| 204 | 213 | 'type' => 'hidden', |
| 205 | 214 | 'default' => $project, |
| | 215 | + 'name' => 'project', |
| 206 | 216 | ); |
| 207 | 217 | $addressInfo['ip'] = array( |
| 208 | 218 | 'type' => 'hidden', |
| 209 | 219 | 'default' => $ip, |
| | 220 | + 'name' => 'ip', |
| 210 | 221 | ); |
| 211 | 222 | $addressInfo['action'] = array( |
| 212 | 223 | 'type' => 'hidden', |
| 213 | 224 | 'default' => 'disassociate', |
| | 225 | + 'name' => 'action', |
| 214 | 226 | ); |
| 215 | 227 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| 216 | 228 | $addressForm->setTitle( SpecialPage::getTitleFor( 'NovaAddress' ) ); |
| — | — | @@ -240,16 +252,19 @@ |
| 241 | 253 | $addressInfo['project'] = array( |
| 242 | 254 | 'type' => 'hidden', |
| 243 | 255 | 'default' => $project, |
| | 256 | + 'name' => 'project', |
| 244 | 257 | ); |
| 245 | 258 | $addressInfo['ip'] = array( |
| 246 | 259 | 'type' => 'hidden', |
| 247 | 260 | 'default' => $ip, |
| | 261 | + 'name' => 'ip', |
| 248 | 262 | ); |
| 249 | 263 | $addressInfo['hostname'] = array( |
| 250 | 264 | 'type' => 'text', |
| 251 | 265 | 'default' => '', |
| 252 | 266 | 'validation-callback' => array( $this, 'validateHostName' ), |
| 253 | 267 | 'label-message' => 'openstackmanager-hostname', |
| | 268 | + 'name' => 'hostname', |
| 254 | 269 | ); |
| 255 | 270 | $domains = OpenStackNovaDomain::getAllDomains( 'public' ); |
| 256 | 271 | $domain_keys = array(); |
| — | — | @@ -261,10 +276,12 @@ |
| 262 | 277 | 'type' => 'select', |
| 263 | 278 | 'options' => $domain_keys, |
| 264 | 279 | 'label-message' => 'openstackmanager-dnsdomain', |
| | 280 | + 'name' => 'domain', |
| 265 | 281 | ); |
| 266 | 282 | $addressInfo['action'] = array( |
| 267 | 283 | 'type' => 'hidden', |
| 268 | 284 | 'default' => 'addhost', |
| | 285 | + 'name' => 'action', |
| 269 | 286 | ); |
| 270 | 287 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| 271 | 288 | $addressForm->setTitle( SpecialPage::getTitleFor( 'NovaAddress' ) ); |
| — | — | @@ -301,22 +318,27 @@ |
| 302 | 319 | $addressInfo['project'] = array( |
| 303 | 320 | 'type' => 'hidden', |
| 304 | 321 | 'default' => $project, |
| | 322 | + 'name' => 'project', |
| 305 | 323 | ); |
| 306 | 324 | $addressInfo['ip'] = array( |
| 307 | 325 | 'type' => 'hidden', |
| 308 | 326 | 'default' => $ip, |
| | 327 | + 'name' => 'ip', |
| 309 | 328 | ); |
| 310 | 329 | $addressInfo['domain'] = array( |
| 311 | 330 | 'type' => 'hidden', |
| 312 | 331 | 'default' => $domain, |
| | 332 | + 'name' => 'domain', |
| 313 | 333 | ); |
| 314 | 334 | $addressInfo['hostname'] = array( |
| 315 | 335 | 'type' => 'hidden', |
| 316 | 336 | 'default' => $hostname, |
| | 337 | + 'name' => 'hostname', |
| 317 | 338 | ); |
| 318 | 339 | $addressInfo['action'] = array( |
| 319 | 340 | 'type' => 'hidden', |
| 320 | 341 | 'default' => 'removehost', |
| | 342 | + 'name' => 'action', |
| 321 | 343 | ); |
| 322 | 344 | $addressForm = new SpecialNovaAddressForm( $addressInfo, 'openstackmanager-novaaddress' ); |
| 323 | 345 | $addressForm->setTitle( SpecialPage::getTitleFor( 'NovaAddress' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php |
| — | — | @@ -57,11 +57,13 @@ |
| 58 | 58 | 'validation-callback' => array( $this, 'validateProjectName' ), |
| 59 | 59 | 'default' => '', |
| 60 | 60 | 'section' => 'project/info', |
| | 61 | + 'name' => 'projectname', |
| 61 | 62 | ); |
| 62 | 63 | |
| 63 | 64 | $projectInfo['action'] = array( |
| 64 | 65 | 'type' => 'hidden', |
| 65 | 66 | 'default' => 'create', |
| | 67 | + 'name' => 'action', |
| 66 | 68 | ); |
| 67 | 69 | |
| 68 | 70 | $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| — | — | @@ -94,14 +96,17 @@ |
| 95 | 97 | 'label-message' => 'openstackmanager-member', |
| 96 | 98 | 'default' => '', |
| 97 | 99 | 'section' => 'project/info', |
| | 100 | + 'name' => 'member', |
| 98 | 101 | ); |
| 99 | 102 | $projectInfo['action'] = array( |
| 100 | 103 | 'type' => 'hidden', |
| 101 | 104 | 'default' => 'addmember', |
| | 105 | + 'name' => 'action', |
| 102 | 106 | ); |
| 103 | 107 | $projectInfo['projectname'] = array( |
| 104 | 108 | 'type' => 'hidden', |
| 105 | 109 | 'default' => $project, |
| | 110 | + 'name' => 'projectname', |
| 106 | 111 | ); |
| 107 | 112 | |
| 108 | 113 | $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| — | — | @@ -140,14 +145,17 @@ |
| 141 | 146 | 'label-message' => 'openstackmanager-member', |
| 142 | 147 | 'section' => 'project/info', |
| 143 | 148 | 'options' => $member_keys, |
| | 149 | + 'name' => 'members', |
| 144 | 150 | ); |
| 145 | 151 | $projectInfo['action'] = array( |
| 146 | 152 | 'type' => 'hidden', |
| 147 | 153 | 'default' => 'deletemember', |
| | 154 | + 'name' => 'action', |
| 148 | 155 | ); |
| 149 | 156 | $projectInfo['projectname'] = array( |
| 150 | 157 | 'type' => 'hidden', |
| 151 | 158 | 'default' => $projectname, |
| | 159 | + 'name' => 'projectname', |
| 152 | 160 | ); |
| 153 | 161 | |
| 154 | 162 | $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| — | — | @@ -181,10 +189,12 @@ |
| 182 | 190 | $projectInfo['projectname'] = array( |
| 183 | 191 | 'type' => 'hidden', |
| 184 | 192 | 'default' => $project, |
| | 193 | + 'name' => 'projectname', |
| 185 | 194 | ); |
| 186 | 195 | $projectInfo['action'] = array( |
| 187 | 196 | 'type' => 'hidden', |
| 188 | 197 | 'default' => 'delete', |
| | 198 | + 'name' => 'action', |
| 189 | 199 | ); |
| 190 | 200 | $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| 191 | 201 | $projectForm->setTitle( SpecialPage::getTitleFor( 'NovaProject' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php |
| — | — | @@ -67,12 +67,14 @@ |
| 68 | 68 | 'label-message' => 'openstackmanager-domainname', |
| 69 | 69 | 'default' => '', |
| 70 | 70 | 'section' => 'domain/info', |
| | 71 | + 'name' => 'domainname', |
| 71 | 72 | ); |
| 72 | 73 | $domainInfo['fqdn'] = array( |
| 73 | 74 | 'type' => 'text', |
| 74 | 75 | 'label-message' => 'openstackmanager-fqdn', |
| 75 | 76 | 'default' => '', |
| 76 | 77 | 'section' => 'domain/info', |
| | 78 | + 'name' => 'fqdn', |
| 77 | 79 | ); |
| 78 | 80 | $domainInfo['location'] = array( |
| 79 | 81 | 'type' => 'text', |
| — | — | @@ -80,10 +82,12 @@ |
| 81 | 83 | 'default' => '', |
| 82 | 84 | 'section' => 'domain/info', |
| 83 | 85 | 'help-message' => 'openstackmanager-location-help', |
| | 86 | + 'name' => 'location', |
| 84 | 87 | ); |
| 85 | 88 | $domainInfo['action'] = array( |
| 86 | 89 | 'type' => 'hidden', |
| 87 | 90 | 'default' => 'create', |
| | 91 | + 'name' => 'action', |
| 88 | 92 | ); |
| 89 | 93 | |
| 90 | 94 | $domainForm = new SpecialNovaDomainForm( $domainInfo, 'openstackmanager-novadomain' ); |
| — | — | @@ -112,10 +116,12 @@ |
| 113 | 117 | $domainInfo['domainname'] = array( |
| 114 | 118 | 'type' => 'hidden', |
| 115 | 119 | 'default' => $domainname, |
| | 120 | + 'name' => 'domainname', |
| 116 | 121 | ); |
| 117 | 122 | $domainInfo['action'] = array( |
| 118 | 123 | 'type' => 'hidden', |
| 119 | 124 | 'default' => 'delete', |
| | 125 | + 'name' => 'action', |
| 120 | 126 | ); |
| 121 | 127 | $domainForm = new SpecialNovaDomainForm( $domainInfo, 'openstackmanager-novadomain' ); |
| 122 | 128 | $domainForm->setTitle( SpecialPage::getTitleFor( 'NovaDomain' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php |
| — | — | @@ -59,6 +59,7 @@ |
| 60 | 60 | 'label-message' => 'openstackmanager-novakeyname', |
| 61 | 61 | 'default' => '', |
| 62 | 62 | 'section' => 'key/info', |
| | 63 | + 'name' => 'keyname', |
| 63 | 64 | ); |
| 64 | 65 | } |
| 65 | 66 | |
| — | — | @@ -67,16 +68,19 @@ |
| 68 | 69 | 'section' => 'key/info', |
| 69 | 70 | 'default' => '', |
| 70 | 71 | 'label-message' => 'openstackmanager-novapublickey', |
| | 72 | + 'name' => 'key', |
| 71 | 73 | ); |
| 72 | 74 | |
| 73 | 75 | $keyInfo['action'] = array( |
| 74 | 76 | 'type' => 'hidden', |
| 75 | 77 | 'default' => 'import', |
| | 78 | + 'name' => 'action', |
| 76 | 79 | ); |
| 77 | 80 | |
| 78 | 81 | $keyInfo['project'] = array( |
| 79 | 82 | 'type' => 'hidden', |
| 80 | 83 | 'default' => htmlentities( $project ), |
| | 84 | + 'name' => 'project', |
| 81 | 85 | ); |
| 82 | 86 | |
| 83 | 87 | $keyForm = new SpecialNovaKeyForm( $keyInfo, 'openstackmanager-novakey' ); |
| — | — | @@ -111,10 +115,12 @@ |
| 112 | 116 | $keyInfo['keyname'] = array( |
| 113 | 117 | 'type' => 'hidden', |
| 114 | 118 | 'default' => $project, |
| | 119 | + 'name' => 'keyname', |
| 115 | 120 | ); |
| 116 | 121 | $keyInfo['project'] = array( |
| 117 | 122 | 'type' => 'hidden', |
| 118 | 123 | 'default' => $keyname, |
| | 124 | + 'name' => 'project', |
| 119 | 125 | ); |
| 120 | 126 | } else if ( $wgOpenStackManagerNovaKeypairStorage == 'ldap' ) { |
| 121 | 127 | $hash = $wgRequest->getVal( 'hash' ); |
| — | — | @@ -126,15 +132,18 @@ |
| 127 | 133 | $keyInfo['hash'] = array( |
| 128 | 134 | 'type' => 'hidden', |
| 129 | 135 | 'default' => $hash, |
| | 136 | + 'name' => 'hash', |
| 130 | 137 | ); |
| 131 | 138 | } |
| 132 | 139 | $keyInfo['key'] = array( |
| 133 | 140 | 'type' => 'hidden', |
| 134 | 141 | 'default' => $keypairs[$hash], |
| | 142 | + 'name' => 'key', |
| 135 | 143 | ); |
| 136 | 144 | $keyInfo['action'] = array( |
| 137 | 145 | 'type' => 'hidden', |
| 138 | 146 | 'default' => 'delete', |
| | 147 | + 'name' => 'action', |
| 139 | 148 | ); |
| 140 | 149 | $keyForm = new SpecialNovaKeyForm( $keyInfo, 'openstackmanager-novakey' ); |
| 141 | 150 | $keyForm->setTitle( SpecialPage::getTitleFor( 'NovaKey' ) ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaRole.php |
| — | — | @@ -69,6 +69,7 @@ |
| 70 | 70 | 'label-message' => 'openstackmanager-member', |
| 71 | 71 | 'options' => $member_keys, |
| 72 | 72 | 'section' => 'role/info', |
| | 73 | + 'name' => 'members', |
| 73 | 74 | ); |
| 74 | 75 | } else { |
| 75 | 76 | if ( !$this->userCanExecute( $wgUser ) ) { |
| — | — | @@ -80,23 +81,28 @@ |
| 81 | 82 | 'label-message' => 'openstackmanager-member', |
| 82 | 83 | 'default' => '', |
| 83 | 84 | 'section' => 'role/info', |
| | 85 | + 'name' => 'members', |
| 84 | 86 | ); |
| 85 | 87 | } |
| 86 | 88 | $roleInfo['action'] = array( |
| 87 | 89 | 'type' => 'hidden', |
| 88 | 90 | 'default' => 'addmember', |
| | 91 | + 'name' => 'action', |
| 89 | 92 | ); |
| 90 | 93 | $roleInfo['rolename'] = array( |
| 91 | 94 | 'type' => 'hidden', |
| 92 | 95 | 'default' => $rolename, |
| | 96 | + 'name' => 'rolename', |
| 93 | 97 | ); |
| 94 | 98 | $roleInfo['projectname'] = array( |
| 95 | 99 | 'type' => 'hidden', |
| 96 | 100 | 'default' => $projectname, |
| | 101 | + 'name' => 'projectname', |
| 97 | 102 | ); |
| 98 | 103 | $roleInfo['returnto'] = array( |
| 99 | 104 | 'type' => 'hidden', |
| 100 | 105 | 'default' => $wgRequest->getText('returnto'), |
| | 106 | + 'name' => 'returnto', |
| 101 | 107 | ); |
| 102 | 108 | |
| 103 | 109 | $roleForm = new SpecialNovaRoleForm( $roleInfo, 'openstackmanager-novarole' ); |
| — | — | @@ -157,22 +163,27 @@ |
| 158 | 164 | 'label-message' => 'openstackmanager-member', |
| 159 | 165 | 'options' => $member_keys, |
| 160 | 166 | 'section' => 'role/info', |
| | 167 | + 'name' => 'members', |
| 161 | 168 | ); |
| 162 | 169 | $roleInfo['action'] = array( |
| 163 | 170 | 'type' => 'hidden', |
| 164 | 171 | 'default' => 'deletemember', |
| | 172 | + 'name' => 'action', |
| 165 | 173 | ); |
| 166 | 174 | $roleInfo['rolename'] = array( |
| 167 | 175 | 'type' => 'hidden', |
| 168 | 176 | 'default' => $rolename, |
| | 177 | + 'name' => 'rolename', |
| 169 | 178 | ); |
| 170 | 179 | $roleInfo['projectname'] = array( |
| 171 | 180 | 'type' => 'hidden', |
| 172 | 181 | 'default' => $projectname, |
| | 182 | + 'name' => 'projectname', |
| 173 | 183 | ); |
| 174 | 184 | $roleInfo['returnto'] = array( |
| 175 | 185 | 'type' => 'hidden', |
| 176 | 186 | 'default' => $wgRequest->getText('returnto'), |
| | 187 | + 'name' => 'returnto', |
| 177 | 188 | ); |
| 178 | 189 | |
| 179 | 190 | $roleForm = new SpecialNovaRoleForm( $roleInfo, 'openstackmanager-novarole' ); |