diff options
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r-- | app/helpers/issues_helper.rb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 60dba73447c..a157b1b7b21 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -28,18 +28,16 @@ module IssuesHelper end def status_box_class(item) - updated_mr_header_enabled = Feature.enabled?(:updated_mr_header, @project) - if item.try(:expired?) - 'status-box-expired' + 'gl-bg-orange-500' elsif item.try(:merged?) - updated_mr_header_enabled ? 'badge-info' : 'status-box-mr-merged' + 'badge-info' elsif item.closed? - item.is_a?(MergeRequest) && updated_mr_header_enabled ? 'badge-danger' : 'status-box-mr-closed' + item.is_a?(MergeRequest) ? 'badge-danger' : 'gl-bg-red-500' elsif item.try(:upcoming?) - 'status-box-upcoming' + 'gl-bg-gray-500' else - item.is_a?(MergeRequest) && updated_mr_header_enabled ? 'badge-success' : 'status-box-open' + item.is_a?(MergeRequest) ? 'badge-success' : 'gl-bg-green-500' end end @@ -218,6 +216,8 @@ module IssuesHelper can_bulk_update: can?(current_user, :admin_issue, project).to_s, can_edit: can?(current_user, :admin_project, project).to_s, can_import_issues: can?(current_user, :import_issues, @project).to_s, + can_read_crm_contact: can?(current_user, :read_crm_contact, project.group).to_s, + can_read_crm_organization: can?(current_user, :read_crm_organization, project.group).to_s, email: current_user&.notification_email_or_default, emails_help_page_path: help_page_path('development/emails', anchor: 'email-namespace'), export_csv_path: export_csv_project_issues_path(project), @@ -238,8 +238,12 @@ module IssuesHelper def group_issues_list_data(group, current_user) common_issues_list_data(group, current_user).merge( + can_create_projects: can?(current_user, :create_projects, group).to_s, + can_read_crm_contact: can?(current_user, :read_crm_contact, group).to_s, + can_read_crm_organization: can?(current_user, :read_crm_organization, group).to_s, has_any_issues: @has_issues.to_s, - has_any_projects: @has_projects.to_s + has_any_projects: @has_projects.to_s, + new_project_path: new_project_path(namespace_id: group.id) ) end |