diff --git a/drupalorg/drupalorg.drush.inc b/drupalorg/drupalorg.drush.inc
index f1436f005f43f428653f814b295840ab2242e209..29b619760d9ba523a3d6d3fdf04cae4e76ba4228 100644
--- a/drupalorg/drupalorg.drush.inc
+++ b/drupalorg/drupalorg.drush.inc
@@ -349,7 +349,10 @@ function drush_drupalorg_org_credit() {
}
// Organization attribution.
- $result = db_query("SELECT fdfact.field_attribute_contribution_to_target_id AS organization, n.nid, fdf_p.field_project_target_id AS project, fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 3 MONTH) AS recent FROM {node} n INNER JOIN {field_data_field_issue_credit} fdfic ON fdfic.entity_id = n.nid INNER JOIN {comment} c ON c.cid = fdfic.field_issue_credit_target_id AND c.status = 1 INNER JOIN {field_data_field_issue_status} fdfis ON fdfis.entity_id = n.nid AND fdfis.field_issue_status_value IN (2,7) INNER JOIN {field_data_field_attribute_as_volunteer} fdf_av ON fdf_av.entity_id = c.cid AND fdf_av.field_attribute_as_volunteer_value = 0 INNER JOIN {field_data_field_attribute_contribution_to} fdfact ON fdfact.entity_id = c.cid INNER JOIN {field_data_field_project} fdf_p ON fdf_p.entity_id = n.nid LEFT JOIN {field_data_field_project_type} fdf_pt ON fdf_pt.entity_id = fdf_p.field_project_target_id INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid WHERE n.type IN (:project_issue_types) AND n.status = 1 AND (fdf_pt.field_project_type_value = 'full' OR fdf_pt.field_project_type_value IS NULL) AND fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR)", [':project_issue_types' => project_issue_issue_node_types()]);
+ $result = db_query("SELECT fdfact.field_attribute_contribution_to_target_id AS organization, n.nid, fdf_p.field_project_target_id AS project, fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 3 MONTH) AS recent FROM {node} n INNER JOIN {field_data_field_issue_credit} fdfic ON fdfic.entity_id = n.nid INNER JOIN {comment} c ON c.cid = fdfic.field_issue_credit_target_id AND c.status = 1 INNER JOIN {field_data_field_issue_status} fdfis ON fdfis.entity_id = n.nid AND fdfis.field_issue_status_value IN (:credited_issue_statuses) INNER JOIN {field_data_field_attribute_as_volunteer} fdf_av ON fdf_av.entity_id = c.cid AND fdf_av.field_attribute_as_volunteer_value = 0 INNER JOIN {field_data_field_attribute_contribution_to} fdfact ON fdfact.entity_id = c.cid INNER JOIN {field_data_field_project} fdf_p ON fdf_p.entity_id = n.nid LEFT JOIN {field_data_field_project_type} fdf_pt ON fdf_pt.entity_id = fdf_p.field_project_target_id INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid WHERE n.type IN (:project_issue_types) AND n.status = 1 AND (fdf_pt.field_project_type_value = 'full' OR fdf_pt.field_project_type_value IS NULL) AND fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR)", [
+ ':credited_issue_statuses' => drupalorg_credited_issue_statuses(),
+ ':project_issue_types' => project_issue_issue_node_types(),
+ ]);
foreach ($result as $row) {
if ($row->recent){
$credits[$row->organization][$row->nid] = $row->project;
@@ -358,7 +361,10 @@ function drush_drupalorg_org_credit() {
}
// Customer attribution.
- $result = db_query("SELECT fdf_fc.field_for_customer_target_id AS organization, n.nid, fdf_p.field_project_target_id AS project, fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 3 MONTH) AS recent FROM {node} n INNER JOIN {field_data_field_issue_credit} fdfic ON fdfic.entity_id = n.nid INNER JOIN {comment} c ON c.cid = fdfic.field_issue_credit_target_id AND c.status = 1 INNER JOIN {field_data_field_issue_status} fdfis ON fdfis.entity_id = n.nid AND fdfis.field_issue_status_value IN (2,7) INNER JOIN {field_data_field_attribute_as_volunteer} fdf_av ON fdf_av.entity_id = c.cid AND fdf_av.field_attribute_as_volunteer_value = 0 INNER JOIN {field_data_field_for_customer} fdf_fc ON fdf_fc.entity_id = c.cid INNER JOIN {field_data_field_project} fdf_p ON fdf_p.entity_id = n.nid LEFT JOIN {field_data_field_project_type} fdf_pt ON fdf_pt.entity_id = fdf_p.field_project_target_id INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid WHERE n.type IN (:project_issue_types) AND n.status = 1 AND (fdf_pt.field_project_type_value = 'full' OR fdf_pt.field_project_type_value IS NULL) AND fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR)", [':project_issue_types' => project_issue_issue_node_types()]);
+ $result = db_query("SELECT fdf_fc.field_for_customer_target_id AS organization, n.nid, fdf_p.field_project_target_id AS project, fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 3 MONTH) AS recent FROM {node} n INNER JOIN {field_data_field_issue_credit} fdfic ON fdfic.entity_id = n.nid INNER JOIN {comment} c ON c.cid = fdfic.field_issue_credit_target_id AND c.status = 1 INNER JOIN {field_data_field_issue_status} fdfis ON fdfis.entity_id = n.nid AND fdfis.field_issue_status_value IN (:credited_issue_statuses) INNER JOIN {field_data_field_attribute_as_volunteer} fdf_av ON fdf_av.entity_id = c.cid AND fdf_av.field_attribute_as_volunteer_value = 0 INNER JOIN {field_data_field_for_customer} fdf_fc ON fdf_fc.entity_id = c.cid INNER JOIN {field_data_field_project} fdf_p ON fdf_p.entity_id = n.nid LEFT JOIN {field_data_field_project_type} fdf_pt ON fdf_pt.entity_id = fdf_p.field_project_target_id INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid WHERE n.type IN (:project_issue_types) AND n.status = 1 AND (fdf_pt.field_project_type_value = 'full' OR fdf_pt.field_project_type_value IS NULL) AND fdf_ilsc.field_issue_last_status_change_value > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR)", [
+ ':credited_issue_statuses' => drupalorg_credited_issue_statuses(),
+ ':project_issue_types' => project_issue_issue_node_types(),
+ ]);
// De-dupe by issue nid.
foreach ($result as $row) {
if ($row->recent) {
diff --git a/drupalorg/drupalorg.install b/drupalorg/drupalorg.install
index 667872a577d3e0e9f9fee685fe0fb87f2cb43dae..5a700c17ee814634682f88500c0c75db54656578 100644
--- a/drupalorg/drupalorg.install
+++ b/drupalorg/drupalorg.install
@@ -6848,3 +6848,26 @@ function drupalorg_update_7163() {
db_drop_field('drupalorg_chargify_subscriptions', 'created_at');
db_drop_field('drupalorg_chargify_subscriptions', 'referrer');
}
+
+/**
+ * Remove credit from closed not-fixed issues.
+ */
+function drupalorg_update_7164() {
+ $closed_not_fixed_statuses = array_diff(drupalorg_credited_issue_statuses(), [
+ variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED),
+ variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED),
+ ]);
+ $result = (new EntityFieldQuery())->entityCondition('entity_type', 'node')
+ ->fieldCondition('field_issue_status', 'value', $closed_not_fixed_statuses)
+ ->fieldCondition('field_issue_credit', 'target_id', NULL, 'IS NOT NULL')
+ ->execute();
+ watchdog('drupalorg', 'Updating @count closed not-fixed issues', ['@count' => count($result['node'])]);
+ foreach (array_chunk(array_keys($result['node']), 50) as $nids) {
+ watchdog('drupalorg', 'Updating closed not-fixed batch: @nids', ['@nids' => implode(',', $nids)]);
+ foreach (node_load_multiple($nids) as $issue_node) {
+ $issue_node->field_issue_credit = [];
+ field_attach_presave('node', $issue_node);
+ field_attach_update('node', $issue_node);
+ }
+ }
+}
diff --git a/drupalorg/drupalorg.module b/drupalorg/drupalorg.module
index 66028604ba1b3143a7396461f0f5f2c274a2df46..64d7b994afcba7b13f33cb5d3577e3650709029a 100644
--- a/drupalorg/drupalorg.module
+++ b/drupalorg/drupalorg.module
@@ -2167,7 +2167,16 @@ function drupalorg_validate_int($element) {
}
}
-/*
+/**
+ * Issue statuses which have credited awarded.
+ */
+function drupalorg_credited_issue_statuses() {
+ $credited_issue_statuses = project_issue_closed_states();
+ $credited_issue_statuses[] = variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED);
+ return $credited_issue_statuses;
+}
+
+/**
* Returns data on recent activity in the Drupal project.
*
* If we do not have data or our data was generated an hour ago,
@@ -2179,8 +2188,12 @@ function drupalorg_get_activity($_force = FALSE) {
}
elseif (lock_acquire('drupalorg_get_activity', 5)) {
$stats = [
- 'people_credited_year' => number_format(db_query('SELECT count(DISTINCT c.uid) FROM {node} n INNER JOIN {comment} c ON c.nid = n.nid AND c.status = 1 INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = n.nid AND fdf_ic.field_issue_credit_target_id = c.cid INNER JOIN {field_data_field_issue_status} fdf_is ON fdf_is.entity_id = n.nid AND fdf_is.field_issue_status_value IN (2,7) INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid AND fdf_ilsc.field_issue_last_status_change_value > unix_timestamp(now() - INTERVAL 1 YEAR) WHERE n.status = 1')->fetchField()),
- 'issue_credits_week' => number_format(db_query('SELECT count(DISTINCT c.nid, c.uid) FROM {node} n INNER JOIN {comment} c ON c.nid = n.nid AND c.status = 1 INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = n.nid AND fdf_ic.field_issue_credit_target_id = c.cid INNER JOIN {field_data_field_issue_status} fdf_is ON fdf_is.entity_id = n.nid AND fdf_is.field_issue_status_value IN (2,7) INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid AND fdf_ilsc.field_issue_last_status_change_value > unix_timestamp(now() - INTERVAL 1 WEEK) WHERE n.status = 1')->fetchField()),
+ 'people_credited_year' => number_format(db_query('SELECT count(DISTINCT c.uid) FROM {node} n INNER JOIN {comment} c ON c.nid = n.nid AND c.status = 1 INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = n.nid AND fdf_ic.field_issue_credit_target_id = c.cid INNER JOIN {field_data_field_issue_status} fdf_is ON fdf_is.entity_id = n.nid AND fdf_is.field_issue_status_value IN (:credited_issue_statuses) INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid AND fdf_ilsc.field_issue_last_status_change_value > unix_timestamp(now() - INTERVAL 1 YEAR) WHERE n.status = 1', [
+ ':credited_issue_statuses' => drupalorg_credited_issue_statuses(),
+ ])->fetchField()),
+ 'issue_credits_week' => number_format(db_query('SELECT count(DISTINCT c.nid, c.uid) FROM {node} n INNER JOIN {comment} c ON c.nid = n.nid AND c.status = 1 INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = n.nid AND fdf_ic.field_issue_credit_target_id = c.cid INNER JOIN {field_data_field_issue_status} fdf_is ON fdf_is.entity_id = n.nid AND fdf_is.field_issue_status_value IN (:credited_issue_statuses) INNER JOIN {field_data_field_issue_last_status_change} fdf_ilsc ON fdf_ilsc.entity_id = n.nid AND fdf_ilsc.field_issue_last_status_change_value > unix_timestamp(now() - INTERVAL 1 WEEK) WHERE n.status = 1', [
+ ':credited_issue_statuses' => drupalorg_credited_issue_statuses(),
+ ])->fetchField()),
'number_of_issue_comments' => number_format(db_query("SELECT COUNT(distinct c.nid) FROM {node} n INNER JOIN {comment} c ON n.nid = c.nid WHERE n.type = :type AND n.status = :status AND c.created > :created", [':type' => 'project_issue', ':status' => 1, ':created' => strtotime("1 week ago")])->fetchField()),
];
cache_set('drupalorg_front_counter_data', $stats, 'drupalorg');
@@ -5228,7 +5241,7 @@ function _drupalorg_organization_credit_summary(stdClass $node) {
}
if ($issues > 0) {
$filter = $cloned->get_item('organization_recent', 'filter', 'field_issue_last_status_change_value');
- $output['issue']['#prefix'] = '<div class="accordion"><h3 id="org-page-issue-credit">' . format_plural($issues, 'Credited on 1 issue fixed in the past @time', 'Credited on @count issues fixed in the past @time', ['@time' => ltrim($filter['value']['value'], '-')]) . '</h3>';
+ $output['issue']['#prefix'] = '<div class="accordion"><h3 id="org-page-issue-credit">' . format_plural($issues, 'Credited on 1 issue in the past @time', 'Credited on @count issues in the past @time', ['@time' => ltrim($filter['value']['value'], '-')]) . '</h3>';
$output['issue']['#suffix'] = '</div>';
}
@@ -6498,7 +6511,7 @@ function drupalorg_user_view($account, $view_mode) {
$issues += $row->nid;
}
if ($issues > 0) {
- $account->content['drupalorg_user_issue_credit']['issue']['#prefix'] = '<h4>' . format_plural($issues, 'Credited on 1 fixed issue', 'Credited on @count fixed issues') . '</h4>';
+ $account->content['drupalorg_user_issue_credit']['issue']['#prefix'] = '<h4>' . format_plural($issues, 'Credited on 1 issue', 'Credited on @count issues') . '</h4>';
}
// User's maintained projects
@@ -7186,7 +7199,7 @@ function drupalorg_preprocess_comment(&$v) {
}
elseif (!empty($v['comment']->field_issue_changes)) {
foreach ($v['comment']->field_issue_changes[LANGUAGE_NONE] as $change) {
- if ($change['field_name'] === 'field_issue_status' && $change['old_value'][0]['value'] == PROJECT_ISSUE_STATE_FIXED && $change['new_value'][0]['value'] == PROJECT_ISSUE_STATE_CLOSED) {
+ if ($change['field_name'] === 'field_issue_status' && $change['old_value'][0]['value'] == variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED) && $change['new_value'][0]['value'] == variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED)) {
$v['classes_array'][] = 'closed';
}
}
diff --git a/drupalorg/js/general.js b/drupalorg/js/general.js
index 0fab60496782ac80099dc96e334cedfe1208e9ce..c951a3152c19493517d4617afafa762e6f7a8042 100644
--- a/drupalorg/js/general.js
+++ b/drupalorg/js/general.js
@@ -261,11 +261,11 @@
}
else {
if (byHtml.length) {
- if (Drupal.settings.drupalOrg.isFixed) {
+ if (Drupal.settings.drupalOrg.isClosed) {
$('#drupalorg-issue-credit-form .credit-summary').html(Drupal.t('<strong>Credit given to</strong> !credits', {'!credits': byHtml.join(', ')}));
}
else {
- $('#drupalorg-issue-credit-form .credit-summary').html(Drupal.t('<strong>Draft credit given to</strong> !credits<br><small><em>Credit is assigned when maintainers comment, and granted when the issue is fixed.</em></small>', {'!credits': byHtml.join(', ')}));
+ $('#drupalorg-issue-credit-form .credit-summary').html(Drupal.t('<strong>Draft credit given to</strong> !credits<br><small><em>Credit is assigned when maintainers comment, and granted when the issue is fixed or closed.</em></small>', {'!credits': byHtml.join(', ')}));
}
}
else {
diff --git a/drupalorg_metrics/drupalorg_metrics.module b/drupalorg_metrics/drupalorg_metrics.module
index b3e90e98d32ce781dcbf80ea344de39094433096..a9400c56587932a7a6f3a7ab0d9a7f72f205d424 100644
--- a/drupalorg_metrics/drupalorg_metrics.module
+++ b/drupalorg_metrics/drupalorg_metrics.module
@@ -167,10 +167,7 @@ function drupalorg_metrics_record_stats($start_year, $end_year) {
$counts['comments'][] = [$start_js, db_query("SELECT COUNT(*) FROM {comment} WHERE status = :status AND created >= :timestamp1 AND created < :timestamp2", [':status' => COMMENT_PUBLISHED, ':timestamp1' => $start, ':timestamp2' => $end])->fetchField()];
$counts['credited'][] = array_merge([$start_js], array_values(db_query("SELECT sum(q.as_volunteer AND q.for_organizations), sum(q.as_volunteer AND NOT q.for_organizations), sum(q.for_organizations AND NOT q.as_volunteer), sum(NOT q.as_volunteer AND NOT q.for_organizations) FROM (SELECT c.uid, coalesce(sum(fdf_aav.field_attribute_as_volunteer_value = 1) > 0, 0) as_volunteer, coalesce(sum(fdf_aav.field_attribute_as_volunteer_value = 0) > 0, 0) for_organizations FROM {search_api_db_project_issues} pi INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = pi.item_id INNER JOIN {comment} c ON c.cid = fdf_ic.field_issue_credit_target_id AND c.status = :comment_published LEFT JOIN {field_data_field_attribute_as_volunteer} fdf_aav ON fdf_aav.entity_id = c.cid WHERE pi.field_issue_status IN (:fixed_statuses) AND pi.field_issue_last_status_change >= :start AND pi.field_issue_last_status_change < :end GROUP BY c.uid ORDER BY NULL) q", [
':comment_published' => COMMENT_PUBLISHED,
- ':fixed_statuses' => [
- variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED),
- variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED),
- ],
+ ':fixed_statuses' => drupalorg_credited_issue_statuses(),
':start' => $start,
':end' => $end,
])->fetchAssoc()));
@@ -180,10 +177,7 @@ function drupalorg_metrics_record_stats($start_year, $end_year) {
if (($year == 2015 && $month >= 4) || $year > 2015) {
$counts['credited-demographics'][] = array_merge([$start_js], array_values(db_query("SELECT coalesce(round(sum(q.underrepresented AND NOT (q.prefer_not OR q.none))/10+rand()-0.5)*10, 0) underrepresented, coalesce(round(sum(q.none AND NOT q.prefer_not)/10+rand()-0.5)*10, 0) none, coalesce(round(sum(q.prefer_not)/10+rand()-0.5)*10, 0) prefer_not, coalesce(round(sum(NOT q.prefer_not AND NOT q.none AND NOT q.underrepresented)/10+rand()-0.5)*10, 0) not_reported FROM (SELECT c.uid, coalesce(sum(fdf_d.field_demographics_value = 'prefer not to answer') > 0, 0) prefer_not, coalesce(sum(fdf_d.field_demographics_value = 'none') > 0, 0) none, coalesce(sum(fdf_d.field_demographics_value NOT IN ('prefer not to answer', 'none')) > 0, 0) underrepresented FROM search_api_db_project_issues pi INNER JOIN field_data_field_issue_credit fdf_ic ON fdf_ic.entity_id = pi.item_id INNER JOIN comment c ON c.cid = fdf_ic.field_issue_credit_target_id AND c.status = :comment_published LEFT JOIN field_data_field_demographics fdf_d ON fdf_d.entity_id = c.uid WHERE pi.field_issue_status IN (:fixed_statuses) AND pi.field_issue_last_status_change >= :start AND pi.field_issue_last_status_change < :end GROUP BY c.uid ORDER BY NULL) q", [
':comment_published' => COMMENT_PUBLISHED,
- ':fixed_statuses' => [
- variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED),
- variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED),
- ],
+ ':fixed_statuses' => drupalorg_credited_issue_statuses(),
':start' => $start,
':end' => $end,
])->fetchAssoc()));
@@ -195,10 +189,7 @@ function drupalorg_metrics_record_stats($start_year, $end_year) {
// By region.
$query = db_query('SELECT fdf_c.field_country_value country, count(DISTINCT c.uid) count FROM {search_api_db_project_issues} pi INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = pi.item_id INNER JOIN {comment} c ON c.cid = fdf_ic.field_issue_credit_target_id AND c.status = :comment_published LEFT JOIN {field_data_field_country} fdf_c ON fdf_c.entity_id = c.uid WHERE pi.field_issue_status IN (:fixed_statuses) AND pi.field_issue_last_status_change >= :start AND pi.field_issue_last_status_change < :end GROUP BY fdf_c.field_country_value ORDER BY NULL', [
':comment_published' => COMMENT_PUBLISHED,
- ':fixed_statuses' => [
- variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED),
- variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED),
- ],
+ ':fixed_statuses' => drupalorg_credited_issue_statuses(),
':start' => $start,
':end' => $end,
]);
@@ -220,10 +211,7 @@ function drupalorg_metrics_record_stats($start_year, $end_year) {
// By account age.
$result = db_query('SELECT greatest(0, timestampdiff(YEAR, from_unixtime(u.created), from_unixtime(:end))) years_ago, count(DISTINCT c.uid) count FROM {search_api_db_project_issues} pi INNER JOIN {field_data_field_issue_credit} fdf_ic ON fdf_ic.entity_id = pi.item_id INNER JOIN {comment} c ON c.cid = fdf_ic.field_issue_credit_target_id AND c.status = :comment_published INNER JOIN {users} u ON u.uid = c.uid WHERE pi.field_issue_status IN (:fixed_statuses) AND pi.field_issue_last_status_change >= :start AND pi.field_issue_last_status_change < :end GROUP BY years_ago ORDER BY NULL', [
':comment_published' => COMMENT_PUBLISHED,
- ':fixed_statuses' => [
- variable_get('project_issue_state_fixed', PROJECT_ISSUE_STATE_FIXED),
- variable_get('project_issue_state_closed', PROJECT_ISSUE_STATE_CLOSED),
- ],
+ ':fixed_statuses' => drupalorg_credited_issue_statuses(),
':start' => $start,
':end' => $end,
])->fetchAllKeyed() + $counts['#account_ages'];
diff --git a/drupalorg_project/drupalorg_project.module b/drupalorg_project/drupalorg_project.module
index 200fd39d78152880b293339ffabfa0a7d98ef787..9183191ddbcd8325e3285fa90752392d439682f9 100644
--- a/drupalorg_project/drupalorg_project.module
+++ b/drupalorg_project/drupalorg_project.module
@@ -548,7 +548,7 @@ function drupalorg_project_form_node_form_alter(&$form, &$form_state) {
'type' => 'setting',
'data' => ['drupalOrg' => [
'isMaintainer' => $is_maintainer,
- 'isFixed' => $is_fixed,
+ 'isClosed' => in_array($wrapper->field_issue_status->value(), drupalorg_credited_issue_statuses()),
'issueCreditTemplate' => t('git commit -m \'Issue #@nid!by: !message\'', ['@nid' => $form_state['node']->nid]),
'issueCreditMessageTemplate' => t('Issue #@nid!by: !message', ['@nid' => $form_state['node']->nid]),
]],
diff --git a/features/drupalorg_user/drupalorg_user.views_default.inc b/features/drupalorg_user/drupalorg_user.views_default.inc
index 2f38a0986379b625b9c922dd23033e409a9598b5..947f5bc046dbd6f61912b90b65db4be5f8fa84bc 100644
--- a/features/drupalorg_user/drupalorg_user.views_default.inc
+++ b/features/drupalorg_user/drupalorg_user.views_default.inc
@@ -448,8 +448,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 2;
/* Filter criterion: Content: Status (field_issue_status) */
@@ -571,8 +571,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
@@ -691,8 +691,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
$handler->display->display_options['path'] = 'u/%/issue-credits/%';
@@ -914,8 +914,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
$handler->display->display_options['path'] = 'u/%/issue-credits';
@@ -1053,8 +1053,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
/* Filter criterion: Comment: Attribute comment at organization (field_attribute_contribution_to) */
@@ -1194,8 +1194,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
/* Filter criterion: Comment: Attribute comment at organization (field_attribute_contribution_to) */
@@ -1379,8 +1379,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
/* Filter criterion: Comment: Attribute comment at organization (field_attribute_contribution_to) */
@@ -2034,8 +2034,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
$handler->display->display_options['path'] = 'u/%/sa-credits';
@@ -2306,8 +2306,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
/* Filter criterion: Comment: Attribute comment at organization (field_attribute_contribution_to) */
@@ -2443,8 +2443,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['menu']['context'] = 0;
$handler->display->display_options['menu']['context_only_inline'] = 0;
- /* Display: OUIC-DataExport */
- $handler = $view->new_display('views_data_export', 'OUIC-DataExport', 'organization_user_issue_credit_page_data_export');
+ /* Display: Organization export */
+ $handler = $view->new_display('views_data_export', 'Organization export', 'organization_user_issue_credit_page_data_export');
$handler->display->display_options['pager']['type'] = 'none';
$handler->display->display_options['pager']['options']['offset'] = '0';
$handler->display->display_options['style_plugin'] = 'views_data_export_csv';
@@ -2559,8 +2559,8 @@ function drupalorg_user_views_default_views() {
$handler->display->display_options['filters']['field_issue_status_value']['table'] = 'field_data_field_issue_status';
$handler->display->display_options['filters']['field_issue_status_value']['field'] = 'field_issue_status_value';
$handler->display->display_options['filters']['field_issue_status_value']['value'] = array(
+ 'Closed' => 'Closed',
2 => '2',
- 7 => '7',
);
$handler->display->display_options['filters']['field_issue_status_value']['group'] = 1;
/* Filter criterion: Comment: Attribute comment at organization (field_attribute_contribution_to) */
@@ -2664,7 +2664,7 @@ function drupalorg_user_views_default_views() {
t('updated [changed]'),
t('Contributor'),
t('Project short name'),
- t('OUIC-DataExport'),
+ t('Organization export'),
t('Title'),
t('Updated date'),
t('Nid'),