Projet

Général

Profil

Révision e4c061ad

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ctools/views_content/plugins/content_types/views_panes.inc
274 274
  }
275 275

  
276 276
  if ($allow['exposed_form'] && !empty($conf['exposed'])) {
277
    foreach ($conf['exposed'] as $filter_name => $filter_value) {
278
      if (!is_array($filter_value)) {
279
        $conf['exposed'][$filter_name] = ctools_context_keyword_substitute($filter_value, array(), $contexts);
280
      }
281
    }
277 282
    $view->set_exposed_input($conf['exposed']);
278 283
  }
279 284

  
......
284 289
    return;
285 290
  }
286 291

  
292
  // Add contextual links to the output.
293
  $block = (array) $block;
294
  views_add_block_contextual_links($block, $view, $display, 'panel_pane');
295
  $block = (object) $block;
296

  
287 297
  $block->title = $view->get_title();
288 298

  
289 299
  if (empty($view->total_rows) || $view->total_rows <= $view->get_items_per_page()) {
......
313 323

  
314 324
  $conf += array(
315 325
    'link_to_view' => $view->display_handler->get_option('link_to_view'),
316
    'more_link' => $view->display_handler->get_option('more_link'),
326
    'more_link' => $view->display_handler->get_option('use_more'),
317 327
    'feed_icons' => FALSE,
318 328
    'use_pager' => $pager['type'] != 'none' && $pager['type'] != 'some',
319 329
    'pager_id' => isset($pager['options']['id']) ? $pager['options']['id'] : 0,
......
408 418
      $form['fields_override'][$field] = array(
409 419
        '#type' => 'checkbox',
410 420
        '#title' => $title,
411
        '#default_value' => isset($conf['fields_override'][$field]) ? $conf['fields_override'][$field] : TRUE,
421
        '#default_value' => isset($conf['fields_override'][$field]) ? $conf['fields_override'][$field] : !$handler->options['exclude'],
412 422
      );
413 423
    }
414 424
  }
......
602 612
    $argument_input = $view->display_handler->get_option('argument_input');
603 613

  
604 614
    foreach ($conf['arguments'] as $key => $value) {
605
      if(!empty($value)){
615
      if (!empty($value)){
606 616
        $label = $argument_input[$key]['label'];
607 617
        $info[] = $label . ': ' . $value;
608 618
      }

Formats disponibles : Unified diff