Commit 9f72205a authored by fjgarlin's avatar fjgarlin Committed by drumm
Browse files

Issue #3292162 by fjgarlin, hestenet, drumm: Decouple organizations from www.drupal.org issues

parent 533c4977
......@@ -4477,21 +4477,6 @@ function drupalorg_node_view($node, $view_mode = 'full') {
$node->content = $content;
// For organizations that request a services listing or training
// listing, show a link to their issue for the node owner and admins.
if (($node->uid === $user->uid || user_access('administer nodes'))) {
if (($node->field_org_marketplace_request[LANGUAGE_NONE][0]['value'] == '1') && !empty($node->field_org_services_issue[LANGUAGE_NONE][0]['target_id'])) {
drupal_set_message(t('Regarding <em>Services listing</em> communicate with site moderators using <a href="!issue">this issue</a>.', [
'!issue' => url('node/' . $node->field_org_services_issue[LANGUAGE_NONE][0]['target_id']),
]), 'status');
}
if (!empty($node->field_org_training_request) && ($node->field_org_training_request[LANGUAGE_NONE][0]['value'] == '1') && !empty($node->field_org_train_issue[LANGUAGE_NONE][0]['target_id'])) {
drupal_set_message(t('Regarding <em>Training listing</em> communicate with site moderators using <a href="!issue">this issue</a>.', [
'!issue' => url('node/' . $node->field_org_train_issue[LANGUAGE_NONE][0]['target_id']),
]), 'status');
}
}
}
}
elseif ($node->type === 'casestudy') {
......@@ -4729,78 +4714,6 @@ function drupalorg_comment_view($comment, $view_mode, $langcode) {
}
}
/**
* Create issue for organizations requesting services or training listing
*/
function drupalorg_org_request_issue($node) {
$changed = FALSE;
// If an organization wants to be listed in the Services section of the Marketplace.
if (($node->field_org_marketplace_request[LANGUAGE_NONE][0]['value'] == '1') && empty($node->field_org_services_issue[LANGUAGE_NONE][0]['target_id'])) {
// A new organization has been posted, create an issue to coordinate review.
$issue = new stdClass();
$issue->type = 'project_issue';
$issue->uid = $node->uid;
$issue->language = LANGUAGE_NONE;
$issue->status = 1;
$issue->title = t('Review @title for Drupal Services listing', array('@title' => $node->title));
$issue->body[LANGUAGE_NONE][] = array(
'value' => t('!link has requested to be included in !services section of the Marketplace.
This issue was generated automatically. To be included, the page must meet these !guidelines. A review by 2 or more community members is needed to add this page to the listing.
Want to help review? Here is how to do it: https://drupal.org/node/1710338',
array('!link' => l($node->title, 'node/' . $node->nid), '!services' => l(t('Drupal Services'), 'drupal-services'), '!guidelines' => l(t('guidelines'), 'marketplace/guidelines/services'))),
'format' => filter_default_format(),
);
$issue->field_project[LANGUAGE_NONE][]['target_id'] = 1848824; // Content project, http://drupal.org/project/content
$issue->field_project[LANGUAGE_NONE][]['target_type'] = 'node';
$issue->field_issue_priority[LANGUAGE_NONE][]['value'] = 200; // normal
$issue->field_issue_status[LANGUAGE_NONE][]['value'] = 8; // needs review
$issue->field_issue_component[LANGUAGE_NONE][]['value'] = 'Services listing';
$issue->field_issue_category[LANGUAGE_NONE][]['value'] = 2; //task
$issue->comment = 2; // read & write
node_save($issue);
// Save the issue's nid for the organization.
$node->field_org_services_issue[LANGUAGE_NONE][0]['target_id'] = $issue->nid;
$changed = TRUE;
}
// If an organization wants to be listed in the Training section of the Marketplace.
if (($node->field_org_training_request[LANGUAGE_NONE][0]['value'] == '1') && empty($node->field_org_train_issue[LANGUAGE_NONE][0]['target_id'])) {
// A new organization has been posted, create an issue to coordinate review.
$issue = new stdClass();
$issue->type = 'project_issue';
$issue->uid = $node->uid;
$issue->language = LANGUAGE_NONE;
$issue->status = 1;
$issue->title = t('Add @title to the Training section', array('@title' => $node->title));
$issue->body[LANGUAGE_NONE][] = array(
'value' => t('!link has requested to be included in the !training of the Marketplace.
This issue was generated automatically. To be included, the page must meet these !guidelines. A review by 2 or more community members is needed to add this page to the listing.
Want to help review? Here is how to do it: https://drupal.org/node/1735864',
array('!link' => l($node->title, 'node/' . $node->nid), '!training' => l(t('Training section'), 'training'), '!guidelines' => l(t('guidelines'), 'marketplace/guidelines/training'))),
'format' => filter_default_format(),
);
$issue->field_project[LANGUAGE_NONE][]['target_id'] = 1848824; // Content project, http://drupal.org/project/content
$issue->field_project[LANGUAGE_NONE][]['target_type'] = 'node';
$issue->field_issue_priority[LANGUAGE_NONE][]['value'] = 200; // normal
$issue->field_issue_status[LANGUAGE_NONE][]['value'] = 8; // needs review
$issue->field_issue_component[LANGUAGE_NONE][]['value'] = 'Training listing';
$issue->field_issue_category[LANGUAGE_NONE][]['value'] = 2; //task
$issue->comment = 2; // read & write
node_save($issue);
// Save the issue's nid for the organization.
$node->field_org_train_issue[LANGUAGE_NONE][0]['target_id'] = $issue->nid;
$changed = TRUE;
}
if ($changed) {
field_attach_update('node', $node);
}
}
/**
* Implements hook_field_storage_pre_insert().
*/
......@@ -4847,7 +4760,6 @@ function drupalorg_node_presave(stdClass $node) {
*/
function drupalorg_node_insert($node) {
if ($node->type === 'organization') {
drupalorg_org_request_issue($node);
// Send an email confirmation to organization owner.
$author = user_load($node->uid);
drupal_mail('drupalorg', 'new_org_created', $author->mail, language_default(), ['user' => $author]);
......@@ -4874,8 +4786,6 @@ function drupalorg_node_update($node) {
$wrapper = entity_metadata_wrapper('node', $node);
if ($node->type === 'organization') {
drupalorg_org_request_issue($node);
// Update users’ organization names when a reference exists.
$query = new EntityFieldQuery();
$result = $query->entityCondition('entity_type', 'field_collection_item')
......@@ -7577,7 +7487,7 @@ function drupalorg_mail($key, &$message, $params) {
t('Dear @name,', ['@name' => $params['user']->name]),
t('Thanks for creating an organization page on Drupal.org. By making this space for your organization, you are showing the community that you are invested in Drupal’s ecosystem.'),
t('If you have any questions about organization pages and putting your best foot forward on Drupal.org, we’re here to help. Email help@drupal.org'),
t('If your organization provides Drupal services, make sure that you’ve requested for your page to be added to the Marketplace. (A checkbox on the organization page is visible for this in Edit mode.) By checking this box, you generate an issue in the Content queue (@url1) for community review. You can learn more about the review process in the guidelines for Drupal Services list (@url2).', ['@url1' => url('project/issues/content', ['query' => ['component' => 'Services listing'], 'absolute' => TRUE]), '@url2' => url('drupalorg/docs/marketplace', ['absolute' => TRUE]),]),
t('If your organization provides Drupal services, make sure that you’ve requested for your page to be added to the Marketplace. (A checkbox on the organization page is visible for this in Edit mode.) You can learn more about the guidelines at @url2', ['@url2' => url('drupalorg/docs/marketplace', ['absolute' => TRUE]),]),
t('When your organization has a presence on Drupal.org, you have a home to show your contributions to the project. We have an issue credit system that uses your team’s contributions to give you a spot on the Marketplace list. The more contribution credits your organization has, the higher your spot on the list. You can learn more about how credit is given (@url1) and where it appears on your organization page. You can also see how Dries provides analysis of who is sponsoring Drupal development (@url2) with data from the issue credit system.', ['@url1' => url('node/3156588', ['absolute' => TRUE]), '@url2' => url('blog/who-sponsors-drupal-development', ['absolute' => TRUE])]),
t('We strongly encourage a Drupal Association Organization Membership or Partnership (@url). It is not required to be listed, but membership fees help fund Drupal.org infrastructure and improvements as well as various community initiatives. When you join, you receive a badge on both your organization page and your team’s user profiles too. Plus, you are helping to keep Drupal.org—the home of the community, where everyone collaborates on the project—up and running.', ['@url' => url('association/support', ['absolute' => TRUE])]),
t('See you on Drupal.org!'),
......
......@@ -1862,9 +1862,7 @@ function drupalorg_admin_pages_views_default_views() {
'field_organization_support' => 'field_organization_support',
'delta' => 'delta',
'field_org_training_request' => 'field_org_training_request',
'field_organization_training_list' => 'field_organization_training_list',
'field_org_marketplace_request' => 'field_org_marketplace_request',
'field_organization_list_rule' => 'field_organization_list_rule',
'field_org_contribution_rank' => 'field_org_contribution_rank',
'field_org_issue_credit_count' => 'field_org_issue_credit_count',
'status' => 'status',
......@@ -1875,9 +1873,9 @@ function drupalorg_admin_pages_views_default_views() {
'field_drupalorg_rank_components_3' => 'field_drupalorg_rank_components_3',
'field_drupalorg_rank_components_4' => 'field_drupalorg_rank_components_4',
'field_drupalorg_rank_components_5' => 'field_drupalorg_rank_components_5',
'field_drupalorg_rank_components_6' => 'field_drupalorg_rank_components_6',
'field_org_issue_credit_count_1' => 'field_org_issue_credit_count_1',
'field_org_issue_credit_year' => 'field_org_issue_credit_year',
'field_drupalorg_rank_components_6' => 'field_drupalorg_rank_components_6',
);
$handler->display->display_options['style_options']['default'] = 'field_org_contribution_rank';
$handler->display->display_options['style_options']['info'] = array(
......@@ -1938,13 +1936,6 @@ function drupalorg_admin_pages_views_default_views() {
'separator' => '',
'empty_column' => 1,
),
'field_organization_training_list' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'align' => '',
'separator' => '',
'empty_column' => 1,
),
'field_org_marketplace_request' => array(
'sortable' => 1,
'default_sort_order' => 'asc',
......@@ -1952,13 +1943,6 @@ function drupalorg_admin_pages_views_default_views() {
'separator' => '',
'empty_column' => 1,
),
'field_organization_list_rule' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'align' => '',
'separator' => '',
'empty_column' => 1,
),
'field_org_contribution_rank' => array(
'sortable' => 1,
'default_sort_order' => 'desc',
......@@ -2015,21 +1999,21 @@ function drupalorg_admin_pages_views_default_views() {
'separator' => '',
'empty_column' => 0,
),
'field_org_issue_credit_count_1' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'field_drupalorg_rank_components_6' => array(
'align' => '',
'separator' => '',
'empty_column' => 0,
),
'field_org_issue_credit_year' => array(
'field_org_issue_credit_count_1' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'align' => '',
'separator' => '',
'empty_column' => 0,
),
'field_drupalorg_rank_components_6' => array(
'field_org_issue_credit_year' => array(
'sortable' => 0,
'default_sort_order' => 'asc',
'align' => '',
'separator' => '',
'empty_column' => 0,
......@@ -2137,22 +2121,12 @@ function drupalorg_admin_pages_views_default_views() {
$handler->display->display_options['fields']['field_org_training_request']['field'] = 'field_org_training_request';
$handler->display->display_options['fields']['field_org_training_request']['label'] = 'Requested Training Listing';
$handler->display->display_options['fields']['field_org_training_request']['type'] = 'list_key';
/* Field: Content: Training listing */
$handler->display->display_options['fields']['field_organization_training_list']['id'] = 'field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['table'] = 'field_data_field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['field'] = 'field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['label'] = 'Training';
/* Field: Content: List in marketplace */
$handler->display->display_options['fields']['field_org_marketplace_request']['id'] = 'field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['table'] = 'field_data_field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['field'] = 'field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['label'] = 'Requested Services Listing';
$handler->display->display_options['fields']['field_org_marketplace_request']['type'] = 'list_key';
/* Field: Content: Services listing */
$handler->display->display_options['fields']['field_organization_list_rule']['id'] = 'field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['field'] = 'field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['label'] = 'Services';
/* Field: Content: Org contribution rank */
$handler->display->display_options['fields']['field_org_contribution_rank']['id'] = 'field_org_contribution_rank';
$handler->display->display_options['fields']['field_org_contribution_rank']['table'] = 'field_data_field_org_contribution_rank';
......@@ -2428,35 +2402,6 @@ function drupalorg_admin_pages_views_default_views() {
38 => 0,
4 => 0,
);
/* Filter criterion: Content: Services listing (field_organization_list_rule) */
$handler->display->display_options['filters']['field_organization_list_rule_value']['id'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['filters']['field_organization_list_rule_value']['field'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['group'] = 1;
$handler->display->display_options['filters']['field_organization_list_rule_value']['exposed'] = TRUE;
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['operator_id'] = 'field_organization_list_rule_value_op';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['label'] = 'Services';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['operator'] = 'field_organization_list_rule_value_op';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['identifier'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['remember_roles'] = array(
2 => '2',
3 => 0,
1 => 0,
39 => 0,
36 => 0,
7 => 0,
34 => 0,
32 => 0,
30 => 0,
22 => 0,
20 => 0,
24 => 0,
28 => 0,
26 => 0,
14 => 0,
38 => 0,
4 => 0,
);
/* Filter criterion: Content: List in Training section (field_org_training_request) */
$handler->display->display_options['filters']['field_org_training_request_value']['id'] = 'field_org_training_request_value';
$handler->display->display_options['filters']['field_org_training_request_value']['table'] = 'field_data_field_org_training_request';
......@@ -2486,35 +2431,6 @@ function drupalorg_admin_pages_views_default_views() {
38 => 0,
4 => 0,
);
/* Filter criterion: Content: Training listing (field_organization_training_list) */
$handler->display->display_options['filters']['field_organization_training_list_value']['id'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['table'] = 'field_data_field_organization_training_list';
$handler->display->display_options['filters']['field_organization_training_list_value']['field'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['group'] = 1;
$handler->display->display_options['filters']['field_organization_training_list_value']['exposed'] = TRUE;
$handler->display->display_options['filters']['field_organization_training_list_value']['expose']['operator_id'] = 'field_organization_training_list_value_op';
$handler->display->display_options['filters']['field_organization_training_list_value']['expose']['label'] = 'Training';
$handler->display->display_options['filters']['field_organization_training_list_value']['expose']['operator'] = 'field_organization_training_list_value_op';
$handler->display->display_options['filters']['field_organization_training_list_value']['expose']['identifier'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['expose']['remember_roles'] = array(
2 => '2',
3 => 0,
1 => 0,
39 => 0,
36 => 0,
7 => 0,
34 => 0,
32 => 0,
30 => 0,
22 => 0,
20 => 0,
24 => 0,
28 => 0,
26 => 0,
14 => 0,
38 => 0,
4 => 0,
);
/* Filter criterion: Content: Office locations - Country */
$handler->display->display_options['filters']['field_office_locations_country']['id'] = 'field_office_locations_country';
$handler->display->display_options['filters']['field_office_locations_country']['table'] = 'field_data_field_office_locations';
......@@ -2667,24 +2583,14 @@ function drupalorg_admin_pages_views_default_views() {
$handler->display->display_options['fields']['field_org_training_request']['id'] = 'field_org_training_request';
$handler->display->display_options['fields']['field_org_training_request']['table'] = 'field_data_field_org_training_request';
$handler->display->display_options['fields']['field_org_training_request']['field'] = 'field_org_training_request';
$handler->display->display_options['fields']['field_org_training_request']['label'] = 'Requested Training Listing';
$handler->display->display_options['fields']['field_org_training_request']['label'] = 'Training listing';
$handler->display->display_options['fields']['field_org_training_request']['type'] = 'list_key';
/* Field: Content: Training listing */
$handler->display->display_options['fields']['field_organization_training_list']['id'] = 'field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['table'] = 'field_data_field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['field'] = 'field_organization_training_list';
$handler->display->display_options['fields']['field_organization_training_list']['label'] = 'Training';
/* Field: Content: List in marketplace */
$handler->display->display_options['fields']['field_org_marketplace_request']['id'] = 'field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['table'] = 'field_data_field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['field'] = 'field_org_marketplace_request';
$handler->display->display_options['fields']['field_org_marketplace_request']['label'] = 'Requested Services Listing';
$handler->display->display_options['fields']['field_org_marketplace_request']['label'] = 'Services listing';
$handler->display->display_options['fields']['field_org_marketplace_request']['type'] = 'list_key';
/* Field: Content: Services listing */
$handler->display->display_options['fields']['field_organization_list_rule']['id'] = 'field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['field'] = 'field_organization_list_rule';
$handler->display->display_options['fields']['field_organization_list_rule']['label'] = 'Services';
/* Field: Content: Org contribution rank */
$handler->display->display_options['fields']['field_org_contribution_rank']['id'] = 'field_org_contribution_rank';
$handler->display->display_options['fields']['field_org_contribution_rank']['table'] = 'field_data_field_org_contribution_rank';
......@@ -2871,9 +2777,7 @@ function drupalorg_admin_pages_views_default_views() {
t('.'),
t(','),
t('Requested Training Listing'),
t('Training'),
t('Requested Services Listing'),
t('Services'),
t('Contribution rank'),
t('Issue credits (90 days)'),
t('Published'),
......@@ -2887,6 +2791,8 @@ function drupalorg_admin_pages_views_default_views() {
t('Request training'),
t('Offices in'),
t('Locations served'),
t('Training listing'),
t('Services listing'),
t('Issue cred rank'),
t('Sponsorship rank'),
t('Org mem rank'),
......
......@@ -1068,7 +1068,7 @@ If your organization does business in countries where you do not have a street a
),
),
'deleted' => 0,
'description' => 'If you request a listing, please review <a href="/marketplace/guidelines">Marketplace guidelines</a>. Volunteer moderators will review your request. If you are not listed, you will still have the page and some features, like your logo replacing company name on profile pages.',
'description' => 'If you request a listing, please review <a href="/marketplace/guidelines">Marketplace guidelines</a>.',
'display' => array(
'default' => array(
'label' => 'hidden',
......@@ -1257,7 +1257,7 @@ If your organization does business in countries where you do not have a street a
// Exported field_instance: 'node-organization-field_org_services_issue'.
$field_instances['node-organization-field_org_services_issue'] = array(
'bundle' => 'organization',
'default_value' => NULL,
'default_value' => array(),
'default_value_function' => '',
'deleted' => 0,
'description' => '',
......@@ -1313,13 +1313,13 @@ If your organization does business in countries where you do not have a street a
),
'widget' => array(
'active' => 1,
'module' => 'entityreference',
'module' => 'field_extrawidgets',
'settings' => array(
'match_operator' => 'STARTS_WITH',
'path' => '',
'size' => 60,
),
'type' => 'entityreference_autocomplete',
'type' => 'field_extrawidgets_hidden',
'weight' => 31,
),
);
......@@ -1327,7 +1327,7 @@ If your organization does business in countries where you do not have a street a
// Exported field_instance: 'node-organization-field_org_train_issue'.
$field_instances['node-organization-field_org_train_issue'] = array(
'bundle' => 'organization',
'default_value' => NULL,
'default_value' => array(),
'default_value_function' => '',
'deleted' => 0,
'description' => '',
......@@ -1383,13 +1383,13 @@ If your organization does business in countries where you do not have a street a
),
'widget' => array(
'active' => 1,
'module' => 'entityreference',
'module' => 'field_extrawidgets',
'settings' => array(
'match_operator' => 'STARTS_WITH',
'path' => '',
'size' => 60,
),
'type' => 'entityreference_autocomplete',
'type' => 'field_extrawidgets_hidden',
'weight' => 33,
),
);
......@@ -1639,11 +1639,7 @@ If your organization does business in countries where you do not have a street a
// Exported field_instance: 'node-organization-field_organization_list_rule'.
$field_instances['node-organization-field_organization_list_rule'] = array(
'bundle' => 'organization',
'default_value' => array(
0 => array(
'value' => 'never',
),
),
'default_value' => array(),
'deleted' => 0,
'description' => 'Make sure to follow <a href="/marketplace/guidelines">Marketplace guidelines</a> and "<a href="/node/1710338">Review marketplace listings</a>" guide.',
'display' => array(
......@@ -1730,9 +1726,9 @@ If your organization does business in countries where you do not have a street a
'weight' => 24,
'widget' => array(
'active' => 1,
'module' => 'options',
'module' => 'field_extrawidgets',
'settings' => array(),
'type' => 'options_buttons',
'type' => 'field_extrawidgets_hidden',
'weight' => 30,
),
'widget_type' => 'optionwidgets_buttons',
......@@ -1979,11 +1975,7 @@ If your organization does business in countries where you do not have a street a
// 'node-organization-field_organization_training_list'.
$field_instances['node-organization-field_organization_training_list'] = array(
'bundle' => 'organization',
'default_value' => array(
0 => array(
'value' => 'off',
),
),
'default_value' => array(),
'deleted' => 0,
'description' => 'Make sure to follow <a href="/marketplace/guidelines">Marketplace guidelines</a> and "<a href="/node/1735864">Review training listings</a>" guide.',
'display' => array(
......@@ -2070,9 +2062,9 @@ If your organization does business in countries where you do not have a street a
'weight' => 26,
'widget' => array(
'active' => 1,
'module' => 'options',
'module' => 'field_extrawidgets',
'settings' => array(),
'type' => 'options_buttons',
'type' => 'field_extrawidgets_hidden',
'weight' => 32,
),
'widget_type' => 'optionwidgets_buttons',
......@@ -2468,7 +2460,7 @@ If your organization does business in countries where you do not have a street a
t('Headquarters');
t('Helps potential clients know what they are getting into.');
t('Hosting type');
t('If you request a listing, please review <a href="/marketplace/guidelines">Marketplace guidelines</a>. Volunteer moderators will review your request. If you are not listed, you will still have the page and some features, like your logo replacing company name on profile pages.');
t('If you request a listing, please review <a href="/marketplace/guidelines">Marketplace guidelines</a>.');
t('List in Training section');
t('List in marketplace');
t('List related sector(s)');
......
......@@ -528,14 +528,6 @@ function drupalorg_marketplace_views_default_views() {
$handler->display->display_options['filters']['field_org_marketplace_request_value']['value'] = array(
1 => '1',
);
/* Filter criterion: Content: Services listing (field_organization_list_rule) */
$handler->display->display_options['filters']['field_organization_list_rule_value']['id'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['filters']['field_organization_list_rule_value']['field'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['value'] = array(
'all-providers' => 'all-providers',
'featured' => 'featured',
);
/* Display: Page */
$handler = $view->new_display('page', 'Page', 'page_1');
......@@ -607,50 +599,6 @@ function drupalorg_marketplace_views_default_views() {
1 => '1',
);
$handler->display->display_options['filters']['field_org_marketplace_request_value']['group'] = 1;
/* Filter criterion: Content: Services listing (field_organization_list_rule) */
$handler->display->display_options['filters']['field_organization_list_rule_value']['id'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['filters']['field_organization_list_rule_value']['field'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['value'] = array(
'all-providers' => 'all-providers',
'featured' => 'featured',
);
$handler->display->display_options['filters']['field_organization_list_rule_value']['group'] = 1;
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['operator_id'] = 'field_organization_list_rule_value_op';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['label'] = 'Services listing';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['operator'] = 'field_organization_list_rule_value_op';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['identifier'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['multiple'] = TRUE;
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['remember_roles'] = array(
2 => '2',
3 => 0,
1 => 0,
39 => 0,
36 => 0,
7 => 0,
34 => 0,
32 => 0,
30 => 0,
22 => 0,
20 => 0,
24 => 0,
41 => 0,
28 => 0,
26 => 0,
14 => 0,
38 => 0,
4 => 0,
42 => 0,
);
$handler->display->display_options['filters']['field_organization_list_rule_value']['expose']['reduce'] = TRUE;
$handler->display->display_options['filters']['field_organization_list_rule_value']['group_info']['label'] = 'Services listing (field_organization_list_rule)';
$handler->display->display_options['filters']['field_organization_list_rule_value']['group_info']['identifier'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['group_info']['remember'] = FALSE;
$handler->display->display_options['filters']['field_organization_list_rule_value']['group_info']['group_items'] = array(
1 => array(),
2 => array(),
3 => array(),
);
/* Filter criterion: Content: Services (taxonomy_vocabulary_48) */
$handler->display->display_options['filters']['taxonomy_vocabulary_48_tid']['id'] = 'taxonomy_vocabulary_48_tid';
$handler->display->display_options['filters']['taxonomy_vocabulary_48_tid']['table'] = 'field_data_taxonomy_vocabulary_48';
......@@ -951,14 +899,6 @@ function drupalorg_marketplace_views_default_views() {
$handler->display->display_options['filters']['field_org_marketplace_request_value']['value'] = array(
1 => '1',
);
/* Filter criterion: Content: Services listing (field_organization_list_rule) */
$handler->display->display_options['filters']['field_organization_list_rule_value']['id'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['table'] = 'field_data_field_organization_list_rule';
$handler->display->display_options['filters']['field_organization_list_rule_value']['field'] = 'field_organization_list_rule_value';
$handler->display->display_options['filters']['field_organization_list_rule_value']['value'] = array(
'all-providers' => 'all-providers',
'featured' => 'featured',
);
/* Filter criterion: Content: Drupal Association supporting program (field_organization_support) */
$handler->display->display_options['filters']['field_organization_support_value']['id'] = 'field_organization_support_value';
$handler->display->display_options['filters']['field_organization_support_value']['table'] = 'field_data_field_organization_support';
......@@ -988,8 +928,6 @@ function drupalorg_marketplace_views_default_views() {
t('Updated date'),
t('A-Z'),
t('Page'),
t('Services listing'),
t('Services listing (field_organization_list_rule)'),
t('Services'),
t('Sectors'),
t('Locations served'),
......@@ -1283,13 +1221,6 @@ For upcoming Trainings check <a href="http://groups.drupal.org/events?type[]=tra
$handler->display->display_options['filters']['field_org_training_request_value']['value'] = array(
1 => '1',
);
/* Filter criterion: Content: Training listing (field_organization_training_list) */
$handler->display->display_options['filters']['field_organization_training_list_value']['id'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['table'] = 'field_data_field_organization_training_list';
$handler->display->display_options['filters']['field_organization_training_list_value']['field'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['value'] = array(
'on' => 'on',
);
/* Display: Page */
$handler = $view->new_display('page', 'Page', 'page_1');
......@@ -1480,13 +1411,6 @@ For upcoming Trainings check <a href="http://groups.drupal.org/events?type[]=tra
$handler->display->display_options['filters']['field_org_training_request_value']['value'] = array(
1 => '1',
);
/* Filter criterion: Content: Training listing (field_organization_training_list) */
$handler->display->display_options['filters']['field_organization_training_list_value']['id'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['table'] = 'field_data_field_organization_training_list';
$handler->display->display_options['filters']['field_organization_training_list_value']['field'] = 'field_organization_training_list_value';
$handler->display->display_options['filters']['field_organization_training_list_value']['value'] = array(
'on' => 'on',
);