summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2011-01-10 20:34:17 (GMT)
committer Earl Miles2011-01-10 20:34:17 (GMT)
commite95fdef3488252075a3444fa2e1ef58e50f321db (patch)
tree39d265b9a9831a1fd7d0a2852d3bdb57f54ae0d3
parentc31c1b24434a98c85c882813cbaa8a5f7d4d60a9 (diff)
#1020824: Finish fixing node template page wizard.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--plugins/page_wizards/node_override.inc12
2 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7bddf98..1d541be 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -27,3 +27,4 @@ Fix the naked style to support content that needs to be rendered.
#977296: Regions with _ such as with two column bricks would not save content.
#987902: Fix flexible layout splitter resize brokenness.
#967734 by das-peter and intoxination: Upgrade node_get_types() in wizard.
+#1020824: Finish fixing node template page wizard.
diff --git a/plugins/page_wizards/node_override.inc b/plugins/page_wizards/node_override.inc
index 966f763..e3d7190 100644
--- a/plugins/page_wizards/node_override.inc
+++ b/plugins/page_wizards/node_override.inc
@@ -113,7 +113,7 @@ function panels_node_override_basic($form, &$form_state) {
'#type' => 'select',
'#title' => t('Node type'),
'#options' => $options,
- '#default_value' => $form_state['cache']->type,
+ '#default_value' => $form_state['wizard cache']->type,
);
ctools_include('page-wizard', 'panels');
@@ -126,7 +126,7 @@ function panels_node_override_basic($form, &$form_state) {
* Submit function to store the form data in our cache.
*/
function panels_node_override_basic_submit(&$form, &$form_state) {
- $cache = &$form_state['cache'];
+ $cache = &$form_state['wizard cache'];
$cache->display->layout = $form_state['values']['layout'];
$cache->type = $form_state['values']['type'];
@@ -201,6 +201,9 @@ function panels_node_override_basic_submit(&$form, &$form_state) {
$pane->position = 0;
$cache->display->content['new-1'] = $pane;
$cache->display->panels[$region][0] = 'new-1';
+ $cache->display->title_pane = 'new-1';
+ $cache->display->hide_title = PANELS_TITLE_PANE;
+
$pane = new stdClass;
$pane->pid = 'new-2';
$pane->panel = $region;
@@ -209,8 +212,7 @@ function panels_node_override_basic_submit(&$form, &$form_state) {
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
- 'mode' => variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED),
- 'order' => variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST),
+ 'mode' => variable_get('comment_default_mode', COMMENT_MODE_THREADED),
'comments_per_page' => variable_get('comment_default_per_page', '50'),
'context' => 'argument_nid_1',
'override_title' => 0,
@@ -279,7 +281,7 @@ function panels_node_override_content_submit(&$form, &$form_state) {
*/
function panels_node_override_finish(&$form_state) {
$page = &$form_state['page'];
- $cache = &$form_state['cache'];
+ $cache = &$form_state['wizard cache'];
// Add the new handler to the page
$cache->handler->conf['display'] = $cache->display;