diff --git a/modules/bim/app/controllers/bim/bcf/issues_controller.rb b/modules/bim/app/controllers/bim/bcf/issues_controller.rb index 6ae7a6681fa1..b9cb9066c739 100644 --- a/modules/bim/app/controllers/bim/bcf/issues_controller.rb +++ b/modules/bim/app/controllers/bim/bcf/issues_controller.rb @@ -46,10 +46,6 @@ class IssuesController < BaseController def upload; end - def index - redirect_to action: :upload - end - def prepare_import render_next rescue StandardError => e diff --git a/modules/bim/app/views/bim/bcf/issues/index.html.erb b/modules/bim/app/views/bim/bcf/issues/index.html.erb deleted file mode 100644 index 7001d48e0dda..000000000000 --- a/modules/bim/app/views/bim/bcf/issues/index.html.erb +++ /dev/null @@ -1,28 +0,0 @@ - - -<%= toolbar title: t('bcf.issues'), html: {class: '-with-dropdown'} do %> - -
  • - <%= link_to({ action: 'upload' }, - title: I18n.t(:label_import), - class: 'button import-bcf-button') do %> - <%= op_icon('button--icon icon-import') %> - <%= t(:label_import) %> - <% end %> -
  • -
  • - <% query = { f: ['bcfIssueAssociated', '=', ['t']] } %> - <%= link_to(project_work_packages_with_query_path(@project, query, format: :bcf), - title: t('bcf.bcf_xml.export'), - class: 'button export-bcf-button') do %> - <%= op_icon('button--icon icon-export') %> - <%= t('bcf.bcf_xml.export') %> - <% end %> -
  • -<% end %> - -<%= render partial: 'render_issues', locals: { issues: @issues } %> - -<%= pagination_links_full @issues %> diff --git a/modules/bim/config/routes.rb b/modules/bim/config/routes.rb index 18ced9377ee2..b6e8c749e3af 100644 --- a/modules/bim/config/routes.rb +++ b/modules/bim/config/routes.rb @@ -33,7 +33,7 @@ scope "projects/:project_id", as: "project" do get "bcf/menu" => "bim/menus#show" - resources :issues, controller: "bim/bcf/issues" do + resources :issues, controller: "bim/bcf/issues", except: :index do get :upload, action: :upload, on: :collection post :prepare_import, action: :prepare_import, on: :collection post :configure_import, action: :configure_import, on: :collection diff --git a/modules/bim/lib/open_project/bim/engine.rb b/modules/bim/lib/open_project/bim/engine.rb index fb7deae4ad75..53e9e5a3aff8 100644 --- a/modules/bim/lib/open_project/bim/engine.rb +++ b/modules/bim/lib/open_project/bim/engine.rb @@ -57,12 +57,12 @@ class Engine < ::Rails::Engine dependencies: %i[view_ifc_models], contract_actions: { ifc_models: %i[create update destroy] } permission :view_linked_issues, - { "bim/bcf/issues": %i[index] }, + {}, permissible_on: :project, dependencies: %i[view_work_packages], contract_actions: { bcf: %i[read] } permission :manage_bcf, - { "bim/bcf/issues": %i[index upload prepare_import configure_import perform_import] }, + { "bim/bcf/issues": %i[upload prepare_import configure_import perform_import] }, permissible_on: :project, dependencies: %i[view_linked_issues view_work_packages diff --git a/modules/boards/app/views/boards/boards/overview.html.erb b/modules/boards/app/views/boards/boards/overview.html.erb deleted file mode 100644 index 95736aa6903f..000000000000 --- a/modules/boards/app/views/boards/boards/overview.html.erb +++ /dev/null @@ -1,40 +0,0 @@ -<%#-- copyright -OpenProject is an open source project management software. -Copyright (C) the OpenProject GmbH - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 3. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2013 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -See COPYRIGHT and LICENSE files for more details. - -++#%> - -<% html_title(t('boards.label_boards')) -%> - -<%= toolbar title: t('boards.label_boards') do %> - <%= render Boards::AddButtonComponent.new %> -<% end %> - -<% if @board_grids.empty? -%> - <%= no_results_box %> -<% else -%> -<%= render Boards::TableComponent.new(rows: @board_grids, current_user: User.current) %> -<% end -%>