diff options
Diffstat (limited to 'app/helpers/issues_helper.rb')
| -rw-r--r-- | app/helpers/issues_helper.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4419b573701..b9499d13076 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -166,10 +166,20 @@ module IssuesHelper jira_integration_path: help_page_url('integration/jira/issues', anchor: 'view-jira-issues'), rss_path: url_for(safe_params.merge(rss_url_options)), sign_in_path: new_user_session_path, - has_issue_date_filter_feature: Feature.enabled?(:issue_date_filter, namespace).to_s + has_issue_date_filter_feature: has_issue_date_filter_feature?(namespace, current_user).to_s } end + def has_issue_date_filter_feature?(namespace, current_user) + enabled_for_user = Feature.enabled?(:issue_date_filter, current_user) + return true if enabled_for_user + + enabled_for_group = Feature.enabled?(:issue_date_filter, namespace.group) if namespace.respond_to?(:group) + return true if enabled_for_group + + Feature.enabled?(:issue_date_filter, namespace) + end + def project_issues_list_data(project, current_user) common_issues_list_data(project, current_user).merge( can_bulk_update: can?(current_user, :admin_issue, project).to_s, @@ -218,6 +228,7 @@ module IssuesHelper dashboard_milestones_path: dashboard_milestones_path(format: :json), empty_state_with_filter_svg_path: image_path('illustrations/empty-state/empty-issues-md.svg'), empty_state_without_filter_svg_path: image_path('illustrations/issue-dashboard_results-without-filter.svg'), + has_issue_date_filter_feature: Feature.enabled?(:issue_date_filter, current_user).to_s, initial_sort: current_user&.user_preference&.issues_sort, is_public_visibility_restricted: Gitlab::CurrentSettings.restricted_visibility_levels&.include?(Gitlab::VisibilityLevel::PUBLIC).to_s, |