Skip to content
Snippets Groups Projects
Commit 403418f7 authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-139] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@738 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 69e99022
Branches
Tags
No related merge requests found
......@@ -88,10 +88,6 @@ function unl_site_create_submit($form, &$form_state) {
function unl_site_list($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'Existing Sites',
);
$headers = array(
'site_path' => array(
......@@ -112,12 +108,7 @@ function unl_site_list($form, &$form_state) {
),
'remove' => 'Remove (can not undo!)'
);
$form['root']['site_list'] = array(
'#theme' => 'unl_table',
'#header' => $headers,
);
$sites = db_select('unl_sites', 's')
->fields('s', array('site_id', 'db_prefix', 'installed', 'site_path', 'uri'))
->extend('TableSort')
......@@ -125,6 +116,19 @@ function unl_site_list($form, &$form_state) {
->execute()
->fetchAll();
$total_no_of_sites = count($sites);
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'Existing Sites ' . '(total: ' . $total_no_of_sites . ')',
);
$form['root']['site_list'] = array(
'#theme' => 'unl_table',
'#header' => $headers,
);
foreach ($sites as $site) {
unset($checkbox);
$form['root']['site_list']['rows'][$site->site_id] = array(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment