Commit ba44b665 authored by Caleb Crawley's avatar Caleb Crawley Committed by Neil Drumm
Browse files

Issue #3313487 by drumm: User profiles: Add community events volunteered at

parent 4e5de57f

drupalorg/drupalorg.module

+17 −13
Original line number Diff line number Diff line
@@ -807,9 +807,9 @@ function drupalorg_field_extra_fields() { 
            'description' => t('Documentation guides that a user maintains'),

            'weight' => 0,

          ),

          'drupalorg_user_events_organized' => [

            'label' => t('Events organized'),

            'description' => t('Events a user has organized'),

          'drupalorg_user_events' => [

            'label' => t('Events'),

            'description' => t('Events a user has been involved in'),

            'weight' => 0,

          ],

          'drupalorg_companies_worked_for' => array(
@@ -2632,7 +2632,7 @@ function drupalorg_preprocess_page(&$variables) { 
  }



  // Reset drupalorg_crosssite_preprocess_page() overrides.

  if ($reset_breadcrumb || $context || in_array($router['path'], ['group/node/%/admin/content', 'u/%/events-organized', 'user/%/documentation'])

  if ($reset_breadcrumb || $context || in_array($router['path'], ['group/node/%/admin/content', 'u/%/events-organized', 'u/%/events-volunteered', 'user/%/documentation'])

    || (isset($variables['node']) && in_array($variables['node']->type, ['casestudy', 'event', 'contributor_role', 'contributor_skill', 'contributor_task', 'organization', 'project_release', 'sa', 'book_listing']))

    || drupalorg_set_section() === 'community') {

    $variables['section_name'] = '';
@@ -5578,8 +5578,9 @@ function drupalorg_views_pre_render(&$view) { 
    og_set_breadcrumb('node', $view->args[0], [l(t('Group'), 'node/' . $view->args[0] . '/group')]);

  }

  elseif ($view->name === 'community_events') {

    if (in_array($view->current_display, ['page_user_events_organized'])) {

      drupal_set_breadcrumb(drupalorg_user_breadcrumb($view->argument['field_organizers_target_id']->value[0]));

    if (in_array($view->current_display, ['page_user_events_organized', 'page_user_events_volunteered'])) {

      $argument = array_values($view->argument)[0];

      drupal_set_breadcrumb(drupalorg_user_breadcrumb($argument->value[0]));

    }

    elseif (in_array($view->current_display, ['upcoming_events', 'upcoming_training', 'block_drupalcon_events', 'local_meetups', 'contribution_events', 'calls_for_content', 'proposed_events'])) {

      $options = field_read_field('field_event_format')['settings']['allowed_values'];
@@ -5939,15 +5940,18 @@ function drupalorg_user_view($account, $view_mode) { 
    ];

  }



  // Organized events.

  // Events.

  $view = views_get_view('community_events');

  $output = $view->preview('block_user_events_organized', [$account->name]);

  if ($view->result) {

    $account->content['drupalorg_user_events_organized'] = [

      '#prefix' => '<h4>' . t('Events organized') . '</h4>',

  foreach (['block_user_events_organized', 'block_user_events_volunteered'] as $display_id) {

    $view_clone = $view->clone_view();

    $output = $view_clone->preview($display_id, [$account->name]);

    if ($view_clone->result) {

      $account->content['drupalorg_user_events'][] = [

        '#prefix' => '<h4>' . check_plain($view_clone->display_handler->get_option('title')) . '</h4>',

        '#markup' => $output,

      ];

    }

  }



  // Contributor roles.

  $view = views_get_view('contributor_roles');

features/drupalorg_community_events/drupalorg_community_events.views_default.inc

+125 −3
Original line number Diff line number Diff line
@@ -2831,7 +2831,9 @@ function drupalorg_community_events_views_default_views() { 
  /* Display: Block: User Events Organized */

  $handler = $view->new_display('block', 'Block: User Events Organized', 'block_user_events_organized');

  $handler->display->display_options['defaults']['title'] = FALSE;

  $handler->display->display_options['title'] = 'Events Organized';

  $handler->display->display_options['title'] = 'Events organized';

  $handler->display->display_options['defaults']['css_class'] = FALSE;

  $handler->display->display_options['css_class'] = 'drupalorg-user-event block';

  $handler->display->display_options['defaults']['use_more'] = FALSE;

  $handler->display->display_options['use_more'] = TRUE;

  $handler->display->display_options['defaults']['use_more_always'] = FALSE;
@@ -2903,7 +2905,9 @@ function drupalorg_community_events_views_default_views() { 
  /* Display: Page: User Events Organized */

  $handler = $view->new_display('page', 'Page: User Events Organized', 'page_user_events_organized');

  $handler->display->display_options['defaults']['title'] = FALSE;

  $handler->display->display_options['title'] = 'Events Organized';

  $handler->display->display_options['title'] = 'Events organized';

  $handler->display->display_options['defaults']['css_class'] = FALSE;

  $handler->display->display_options['css_class'] = 'drupalorg-user-event page';

  $handler->display->display_options['defaults']['pager'] = FALSE;

  $handler->display->display_options['pager']['type'] = 'full';

  $handler->display->display_options['pager']['options']['items_per_page'] = '24';
@@ -2951,6 +2955,118 @@ function drupalorg_community_events_views_default_views() { 
  $handler->display->display_options['arguments']['field_organizers_target_id']['validate']['type'] = 'user';

  $handler->display->display_options['arguments']['field_organizers_target_id']['validate_options']['type'] = 'name';

  $handler->display->display_options['path'] = 'u/%/events-organized';



  /* Display: Block: User Events Volunteered */

  $handler = $view->new_display('block', 'Block: User Events Volunteered', 'block_user_events_volunteered');

  $handler->display->display_options['defaults']['title'] = FALSE;

  $handler->display->display_options['title'] = 'Events volunteered at';

  $handler->display->display_options['defaults']['css_class'] = FALSE;

  $handler->display->display_options['css_class'] = 'drupalorg-user-event block';

  $handler->display->display_options['defaults']['use_more'] = FALSE;

  $handler->display->display_options['use_more'] = TRUE;

  $handler->display->display_options['defaults']['use_more_always'] = FALSE;

  $handler->display->display_options['defaults']['use_more_always'] = FALSE;

  $handler->display->display_options['use_more_always'] = FALSE;

  $handler->display->display_options['defaults']['use_more_text'] = FALSE;

  $handler->display->display_options['use_more_text'] = 'View all events volunteered at';

  $handler->display->display_options['defaults']['link_display'] = FALSE;

  $handler->display->display_options['link_display'] = 'page_user_events_volunteered';

  $handler->display->display_options['defaults']['pager'] = FALSE;

  $handler->display->display_options['pager']['type'] = 'some';

  $handler->display->display_options['pager']['options']['items_per_page'] = '4';

  $handler->display->display_options['pager']['options']['offset'] = '0';

  $handler->display->display_options['defaults']['fields'] = FALSE;

  /* Field: Content: Logo */

  $handler->display->display_options['fields']['field_event_logo']['id'] = 'field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['table'] = 'field_data_field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['field'] = 'field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['label'] = '';

  $handler->display->display_options['fields']['field_event_logo']['element_label_colon'] = FALSE;

  $handler->display->display_options['fields']['field_event_logo']['click_sort_column'] = 'fid';

  $handler->display->display_options['fields']['field_event_logo']['settings'] = array(

    'image_style' => 'grid-3-2x',

    'image_link' => 'content',

  );

  /* Field: Content: Title */

  $handler->display->display_options['fields']['title']['id'] = 'title';

  $handler->display->display_options['fields']['title']['table'] = 'node';

  $handler->display->display_options['fields']['title']['field'] = 'title';

  $handler->display->display_options['fields']['title']['label'] = '';

  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;

  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;

  $handler->display->display_options['defaults']['sorts'] = FALSE;

  /* Sort criterion: Content: Event date(s) -  start date (field_date_of_event) */

  $handler->display->display_options['sorts']['field_date_of_event_value']['id'] = 'field_date_of_event_value';

  $handler->display->display_options['sorts']['field_date_of_event_value']['table'] = 'field_data_field_date_of_event';

  $handler->display->display_options['sorts']['field_date_of_event_value']['field'] = 'field_date_of_event_value';

  $handler->display->display_options['sorts']['field_date_of_event_value']['order'] = 'DESC';

  $handler->display->display_options['defaults']['arguments'] = FALSE;

  /* Contextual filter: Content: Volunteers (field_event_volunteers) */

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['id'] = 'field_event_volunteers_target_id';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['table'] = 'field_data_field_event_volunteers';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['field'] = 'field_event_volunteers_target_id';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['default_action'] = 'default';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['default_argument_type'] = 'node';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary']['number_of_records'] = '0';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary']['format'] = 'default_summary';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary_options']['items_per_page'] = '25';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['specify_validation'] = TRUE;

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['validate']['type'] = 'user';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['validate_options']['type'] = 'name';



  /* Display: Page: User Volunteer Events */

  $handler = $view->new_display('page', 'Page: User Volunteer Events', 'page_user_events_volunteered');

  $handler->display->display_options['defaults']['title'] = FALSE;

  $handler->display->display_options['title'] = 'Events Volunteered';

  $handler->display->display_options['defaults']['css_class'] = FALSE;

  $handler->display->display_options['css_class'] = 'drupalorg-user-event page';

  $handler->display->display_options['defaults']['pager'] = FALSE;

  $handler->display->display_options['pager']['type'] = 'full';

  $handler->display->display_options['pager']['options']['items_per_page'] = '24';

  $handler->display->display_options['pager']['options']['offset'] = '0';

  $handler->display->display_options['pager']['options']['id'] = '0';

  $handler->display->display_options['pager']['options']['quantity'] = '9';

  $handler->display->display_options['defaults']['fields'] = FALSE;

  /* Field: Content: Logo */

  $handler->display->display_options['fields']['field_event_logo']['id'] = 'field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['table'] = 'field_data_field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['field'] = 'field_event_logo';

  $handler->display->display_options['fields']['field_event_logo']['label'] = '';

  $handler->display->display_options['fields']['field_event_logo']['element_label_colon'] = FALSE;

  $handler->display->display_options['fields']['field_event_logo']['click_sort_column'] = 'fid';

  $handler->display->display_options['fields']['field_event_logo']['settings'] = array(

    'image_style' => 'grid-3-2x',

    'image_link' => 'content',

  );

  /* Field: Content: Title */

  $handler->display->display_options['fields']['title']['id'] = 'title';

  $handler->display->display_options['fields']['title']['table'] = 'node';

  $handler->display->display_options['fields']['title']['field'] = 'title';

  $handler->display->display_options['fields']['title']['label'] = '';

  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;

  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;

  $handler->display->display_options['defaults']['sorts'] = FALSE;

  /* Sort criterion: Content: Event date(s) -  start date (field_date_of_event) */

  $handler->display->display_options['sorts']['field_date_of_event_value']['id'] = 'field_date_of_event_value';

  $handler->display->display_options['sorts']['field_date_of_event_value']['table'] = 'field_data_field_date_of_event';

  $handler->display->display_options['sorts']['field_date_of_event_value']['field'] = 'field_date_of_event_value';

  $handler->display->display_options['sorts']['field_date_of_event_value']['order'] = 'DESC';

  $handler->display->display_options['defaults']['arguments'] = FALSE;

  /* Contextual filter: Content: Volunteers (field_event_volunteers) */

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['id'] = 'field_event_volunteers_target_id';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['table'] = 'field_data_field_event_volunteers';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['field'] = 'field_event_volunteers_target_id';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['default_action'] = 'default';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['title_enable'] = TRUE;

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['title'] = 'Events %1 volunteered at';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['default_argument_type'] = 'node';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary']['number_of_records'] = '0';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary']['format'] = 'default_summary';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['summary_options']['items_per_page'] = '25';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['specify_validation'] = TRUE;

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['validate']['type'] = 'user';

  $handler->display->display_options['arguments']['field_event_volunteers_target_id']['validate_options']['type'] = 'name';

  $handler->display->display_options['path'] = 'u/%/events-volunteered';

  $translatables['community_events'] = array(

    t('Master'),

    t('more'),
@@ -3028,10 +3144,16 @@ function drupalorg_community_events_views_default_views() { 
    t('DrupalCon events'),

    t('No events at this time'),

    t('Block: User Events Organized'),

    t('Events Organized'),

    t('Events organized'),

    t('View all events organized'),

    t('Page: User Events Organized'),

    t('Events organized by %1'),

    t('Block: User Events Volunteered'),

    t('Events volunteered at'),

    t('View all events volunteered at'),

    t('Page: User Volunteer Events'),

    t('Events Volunteered'),

    t('Events %1 volunteered at'),

  );

  $export['community_events'] = $view;

features/drupalorg_user/drupalorg_user.field_group.inc

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ function drupalorg_user_field_group_info() { 
      3 => 'field_drupal_contributions',

      4 => 'summary',

      5 => 'drupalorg_documentation_guides',

      6 => 'drupalorg_user_events_organized',

      6 => 'drupalorg_user_events',

      7 => 'drupalorg_user_issue_credit',

      8 => 'drupalorg_user_contributor_roles',

      9 => 'drupalorg_user_vetted',

features/drupalorg_user/drupalorg_user.strongarm.inc

+1 −7
Original line number Diff line number Diff line
@@ -127,13 +127,7 @@ function drupalorg_user_strongarm() { 
            'visible' => TRUE,

          ),

        ),

        'drupalorg_user_events_volunteered' => array(

          'default' => array(

            'weight' => '3',

            'visible' => TRUE,

          ),

        ),

        'drupalorg_user_events_organized' => array(

        'drupalorg_user_events' => array(

          'default' => array(

            'weight' => '10',

            'visible' => TRUE,