diff options
Diffstat (limited to 'app/views/projects/issues')
6 files changed, 24 insertions, 41 deletions
diff --git a/app/views/projects/issues/_by_email_description.html.haml b/app/views/projects/issues/_by_email_description.html.haml index 0ff852352e1..aeed5fb69c9 100644 --- a/app/views/projects/issues/_by_email_description.html.haml +++ b/app/views/projects/issues/_by_email_description.html.haml @@ -1,6 +1,6 @@ The subject will be used as the title of the new issue, and the message will be the description. -= link_to 'Quick actions', help_page_path('user/project/quick_actions'), target: '_blank' += link_to 'Quick actions', help_page_path('user/project/quick_actions'), target: '_blank', rel: 'noopener noreferrer' and styling with -= link_to 'Markdown', help_page_path('user/markdown'), target: '_blank' += link_to 'Markdown', help_page_path('user/markdown'), target: '_blank', rel: 'noopener noreferrer' are supported. diff --git a/app/views/projects/issues/_design_management.html.haml b/app/views/projects/issues/_design_management.html.haml index a2ff9620c0c..c5ce0549816 100644 --- a/app/views/projects/issues/_design_management.html.haml +++ b/app/views/projects/issues/_design_management.html.haml @@ -8,7 +8,11 @@ - if @project.design_management_enabled? - add_page_startup_graphql_call('design_management/get_design_list', { fullPath: @project.full_path, iid: @issue.iid.to_s, atVersion: nil }) - add_page_startup_graphql_call('design_management/design_permissions', { fullPath: @project.full_path, iid: @issue.iid.to_s }) - .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } } + .js-design-management{ data: { project_path: @project.full_path, + issue_iid: @issue.iid, + issue_path: project_issue_path(@project, @issue), + register_path: new_user_registration_path(redirect_to_referer: 'yes'), + sign_in_path: new_session_path(:user, redirect_to_referer: 'yes') } } - else .gl-border-solid.gl-border-1.gl-border-gray-100.gl-rounded-base.gl-mt-5.gl-p-3.gl-text-center = enable_lfs_message diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 2dc21685057..4c96875ce42 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -1,4 +1,3 @@ --# DANGER: Any changes to this file need to be reflected in issuables_list/components/issuable.vue! %li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id, qa_selector: 'issue_container', qa_issue_title: issue.title } } .issuable-info-container - if @can_bulk_update diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index 1ab51df6d24..09b0b7a4d9b 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -1,25 +1,10 @@ -- is_project_overview = local_assigns.fetch(:is_project_overview, false) = render 'shared/alerts/positioning_disabled' if @sort == 'relative_position' -- if Feature.enabled?(:vue_issuables_list, @project) && !is_project_overview - - data_endpoint = local_assigns.fetch(:data_endpoint, expose_path(api_v4_projects_issues_path(id: @project.id))) - - default_empty_state_meta = { create_issue_path: new_project_issue_path(@project), svg_path: image_path('illustrations/issues.svg') } - - data_empty_state_meta = local_assigns.fetch(:data_empty_state_meta, default_empty_state_meta) - - type = local_assigns.fetch(:type, 'issues') - - if type == 'issues' && use_startup_call? - - add_page_startup_api_call(api_v4_projects_issues_path(id: @project.id, params: startup_call_params)) - .js-issuables-list{ data: { endpoint: data_endpoint, - 'empty-state-meta': data_empty_state_meta.to_json, - 'can-bulk-edit': @can_bulk_update.to_json, - 'sort-key': @sort, - type: type, - 'scoped-labels-available': scoped_labels_available?(@project).to_json } } -- else - - empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues') - %ul.content-list.issues-list.issuable-list{ class: issue_manual_ordering_class } - = render partial: "projects/issues/issue", collection: @issues - - if @issues.blank? - = render empty_state_path +%ul.content-list.issues-list.issuable-list{ class: issue_manual_ordering_class } + = render partial: "projects/issues/issue", collection: @issues + - if @issues.blank? + - empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues') + = render empty_state_path - - if @issues.present? - = paginate_collection @issues, total_pages: @total_pages +- if @issues.present? + = paginate_collection @issues, total_pages: @total_pages diff --git a/app/views/projects/issues/_service_desk_empty_state.html.haml b/app/views/projects/issues/_service_desk_empty_state.html.haml index afeb2a23ea2..3e0b80700fe 100644 --- a/app/views/projects/issues/_service_desk_empty_state.html.haml +++ b/app/views/projects/issues/_service_desk_empty_state.html.haml @@ -27,7 +27,11 @@ .svg-content = render 'shared/empty_states/icons/service_desk_setup.svg' .text-content - %h4= s_('ServiceDesk|Service Desk is enabled but not yet active') - %p - = s_("ServiceDesk|To activate Service Desk on this instance, an instance administrator must first set up incoming email.") - = link_to _('Learn more.'), help_page_path('administration/incoming_email', anchor: 'set-it-up') + - if can_edit_project_settings + %h4= s_('ServiceDesk|Service Desk is not supported') + %p + = s_("ServiceDesk|To enable Service Desk on this instance, an instance administrator must first set up incoming email.") + = link_to _('Learn more.'), help_page_path('administration/incoming_email', anchor: 'set-it-up') + - else + %h4= s_('ServiceDesk|Service Desk is not enabled') + %p= s_("ServiceDesk|For help setting up the Service Desk for your instance, please contact an administrator.") diff --git a/app/views/projects/issues/service_desk.html.haml b/app/views/projects/issues/service_desk.html.haml index b0d8791c566..fb5880f633a 100644 --- a/app/views/projects/issues/service_desk.html.haml +++ b/app/views/projects/issues/service_desk.html.haml @@ -7,9 +7,7 @@ - support_bot_attrs = { service_desk_enabled: @project.service_desk_enabled?, **UserSerializer.new.represent(User.support_bot) }.to_json -- data_endpoint = "#{expose_path(api_v4_projects_issues_path(id: @project.id))}?author_username=#{User.support_bot.username}" - -%div{ class: "js-service-desk-issues service-desk-issues", data: { support_bot: support_bot_attrs, service_desk_meta: service_desk_meta(@project) } } +.js-service-desk-issues.service-desk-issues{ data: { support_bot: support_bot_attrs } } .top-area = render 'shared/issuable/nav', type: :issues .nav-controls.d-block.d-sm-none @@ -20,12 +18,5 @@ - if Gitlab::ServiceDesk.supported? = render 'service_desk_info_content' - -# TODO Remove empty_state_path once vue_issuables_list FF is removed. - -# https://gitlab.com/gitlab-org/gitlab/-/issues/235652 - -# `empty_state_path` is used to render the empty state in the HAML version of issuables list. .issues-holder - = render 'projects/issues/issues', - empty_state_path: 'service_desk_empty_state', - data_endpoint: data_endpoint, - data_empty_state_meta: service_desk_meta(@project), - type: 'service_desk' + = render 'projects/issues/issues', empty_state_path: 'service_desk_empty_state' |