summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/pages/configurations')
-rw-r--r--frontend/pages/configurations/manager.php11
-rw-r--r--frontend/pages/configurations/wizard.php1
2 files changed, 6 insertions, 6 deletions
diff --git a/frontend/pages/configurations/manager.php b/frontend/pages/configurations/manager.php
index 68297fe..0488a11 100644
--- a/frontend/pages/configurations/manager.php
+++ b/frontend/pages/configurations/manager.php
@@ -9,11 +9,7 @@ function init_configurations_manager() {
function body_configurations_manager() {
global $S, $request, $conf;
echo '<h3>Configurations Manager</h3>';
- $r=$S['pdo']->query('SELECT * FROM `configurations` WHERE `owner`='.$S['user']->id);
- if ($r->rowCount() == 0) {
- echo print_warning('You have no configurations.').'<a href="'.url('create').'">Create a configuration</a>';
- return;
- } elseif (isset($request['build']) && isset($request['configuration'])) {
+ if (isset($request['build']) && isset($request['configuration'])) {
$c=new sql_configuration($request['configuration']);
if ($c->owner!=$S['user']->id) {
echo print_error('You do not have permission to build this configuration.');
@@ -26,6 +22,11 @@ function body_configurations_manager() {
echo print_error('Invalid configuration', 'Your configuration could not be submitted for build. Please return to <a href="'.url("config/$c->id/$build").'">step '.$build.'</a> and continue configuration from there.');
}
}
+ $r=$S['pdo']->query('SELECT * FROM `configurations` WHERE `owner`='.$S['user']->id);
+ if ($r->rowCount() == 0) {
+ echo print_warning('You have no configurations.').'<a href="'.url('create').'">Create a configuration</a>';
+ return;
+ }
echo '<form action="'.url('configurations').'" method="post"><table><tr><th>ID</th><th>Name</th>'.(count($conf['modules']) > 1?'<th>Module</th>':'').'<th>Status</th><th>Options</th><th>Builds</th></tr>'."\n";
$ready=0;
while($c=$r->fetch(PDO::FETCH_ASSOC)) {
diff --git a/frontend/pages/configurations/wizard.php b/frontend/pages/configurations/wizard.php
index cc46405..947e321 100644
--- a/frontend/pages/configurations/wizard.php
+++ b/frontend/pages/configurations/wizard.php
@@ -35,7 +35,6 @@ function init_configurations_wizard() {
}
} elseif (isset($request['init'])) {
$S['wizard']['configuration']=new sql_configuration();
- wizard::set_configuration($S['wizard']['configuration']);
$configuration=&$S['wizard']['configuration'];
$configuration->name=$request['name'];
$mod=isset($request['mod']) && isset($conf['modules'][$request['mod']])?$conf['modules'][$request['mod']]:$conf['modules'][0];