WIP: Create WP filter for "BCF issue associated"

pull/7348/head
Wieland Lindenthal 5 years ago
parent a21f49f3a1
commit b23250ed60
  1. 2
      config/locales/en.yml
  2. 6
      modules/bcf/app/controllers/bcf/issues_controller.rb
  3. 20
      modules/bcf/app/views/bcf/issues/index.html.erb
  4. 1
      modules/bcf/lib/open_project/bcf.rb
  5. 80
      modules/bcf/lib/open_project/bcf/bcf_issue_associated_filter.rb
  6. 2
      modules/bcf/lib/open_project/bcf/bcf_xml/issue_reader.rb
  7. 32
      modules/bcf/lib/open_project/bcf/engine.rb

@ -1107,6 +1107,8 @@ en:
general_text_yes: "yes"
general_text_No: "No"
general_text_Yes: "Yes"
general_text_true: "true"
general_text_false: "false"
gui_validation_error: "1 error"
gui_validation_error_plural: "%{count} errors"

@ -43,8 +43,6 @@ module ::Bcf
before_action :build_importer, only: %i[prepare_import configure_import perform_import]
before_action :get_issue_type
menu_item :bcf
def index
@ -190,10 +188,6 @@ module ::Bcf
@importer = ::OpenProject::Bcf::BcfXml::Importer.new @bcf_xml_file, @project, current_user: current_user
end
def get_issue_type
@issue_type = @project.types.find_by(name: 'Issue [BCF]')
end
def get_persisted_file
@bcf_attachment = Attachment.find_by! id: session[:bcf_file_id], author: current_user
@bcf_xml_file = File.new @bcf_attachment.local_path

@ -13,17 +13,15 @@
<span class="button--text"><%= l(:label_import) %></span>
<% end %>
</li>
<% if @issue_type && @issues.present? %>
<li class="toolbar-item">
<% query = { f: [filter_object('type', '=', @issue_type.id)] } %>
<%= 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') %>
<span class="button--text"><%= t('bcf.bcf_xml.export') %></span>
<% end %>
</li>
<% end %>
<li class="toolbar-item">
<% 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') %>
<span class="button--text"><%= t('bcf.bcf_xml.export') %></span>
<% end %>
</li>
<% end %>
<%= render partial: 'render_issues', locals: { issues: @issues } %>

@ -2,5 +2,6 @@ module OpenProject
module Bcf
require "open_project/bcf/engine"
require "open_project/bcf/bcf_xml"
require "open_project/bcf/bcf_issue_associated_filter"
end
end

@ -0,0 +1,80 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# 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-2017 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 doc/COPYRIGHT.rdoc for more details.
#++
module ::OpenProject::Bcf
class ::BcfIssueAssociatedFilter < ::Queries::WorkPackages::Filter::WorkPackageFilter
attr_reader :join_table_suffix
def type
:list
end
def allowed_values
[
[I18n.t(:general_text_true), OpenProject::Database::DB_VALUE_TRUE],
[I18n.t(:general_text_false), OpenProject::Database::DB_VALUE_FALSE]
]
end
def where
if associated?
Queries::Operators::All.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
elsif not_associated?
Queries::Operators::None.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
else
raise 'Unsupported operator or value'
end
end
def includes
:bcf_issue
end
def type_strategy
@type_strategy ||= ::Queries::Filters::Strategies::BooleanList.new self
end
private
def associated?
(operator == '=' && values.first == OpenProject::Database::DB_VALUE_TRUE) ||
(operator == '!' && values.first == OpenProject::Database::DB_VALUE_FALSE)
end
def not_associated?
(operator == '=' && values.first == OpenProject::Database::DB_VALUE_FALSE) ||
(operator == '!' && values.first == OpenProject::Database::DB_VALUE_TRUE)
end
def dependency_class
'::API::V3::Queries::Schemas::BooleanListFilterDependencyRepresenter'
end
end
end

@ -143,7 +143,7 @@ module OpenProject::Bcf::BcfXml
else
issue.errors.add :type,
:blank,
message: "Can't find any matching type."
message: "Can't find any matching type."
ServiceResult.new success: false,
errors: issue.errors,
result: issue

@ -1,3 +1,33 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
#
# 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-2017 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 doc/COPYRIGHT.rdoc for more details.
#++
require 'open_project/plugins'
module OpenProject::Bcf
@ -82,6 +112,8 @@ module OpenProject::Bcf
config.to_prepare do
WorkPackage::Exporter
.register_for_list(:bcf, OpenProject::Bcf::BcfXml::Exporter)
Queries::Register.filter Query, OpenProject::Bcf::BcfIssueAssociatedFilter
end
end
end

Loading…
Cancel
Save