redmine_extensions 0.1.15 → 0.1.16

data/app/views/easy_entity_assignments/_query_index.html.erb.orig

@@ -1,16 +0,0 @@
-<<<<<<< HEAD
-<% query_outputs(query, entities: referenced_entities, options: { hascontextmenu: true, disable_sort: true }).each do |output| %>
-  <%= output.render_data %>
-=======
-<% if display_style == :list %>
-  <%= render :partial => 'easy_queries/easy_query_entities_list', :locals => {:query => query, :entities => entities, :options => {:hascontextmenu => true, :disable_sort => true} } -%>
-<% elsif display_style == :tile %>
-  <div class="easy-entity-cards-container">
-    <div class="splitcontent">
-      <% entities.each do |referenced_entity| %>
-        <%# render_easy_entity_card(referenced_entity, entity, options.merge(:referenced_entities => referenced_entities)) %>
-      <% end %>
-    </div>
-  </div>
->>>>>>> stable
-<% end %>

data/lib/redmine_extensions/redmine_patches/controllers/issues_controller_patch.rb

@@ -1,9 +0,0 @@
-module RedmineExtensions
-  module IssuesControllerPatch
-
-    def ahojky
-      'ahoj'
-    end
-
-  end
-end

data/lib/redmine_extensions/version.rb.orig

@@ -1,7 +0,0 @@
-module RedmineExtensions
-<<<<<<< HEAD
-  VERSION = '0.1.13'
-=======
-  VERSION = '0.0.38'
->>>>>>> stable
-end

data/spec/redmine/app/controllers/custom_field_enumerations_controller.rb

@@ -1,75 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
-#
-# 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.
-
-class CustomFieldEnumerationsController < ApplicationController
-  layout 'admin'
-
-  before_action :require_admin
-  before_action :find_custom_field
-  before_action :find_enumeration, :only => :destroy
-
-  helper :custom_fields
-
-  def index
-    @values = @custom_field.enumerations.order(:position)
-  end
-
-  def create
-    @value = @custom_field.enumerations.build
-    @value.safe_attributes = params[:custom_field_enumeration]
-    @value.save
-    respond_to do |format|
-      format.html { redirect_to custom_field_enumerations_path(@custom_field) }
-      format.js
-    end
-  end
-
-  def update_each
-    saved = CustomFieldEnumeration.update_each(@custom_field, params[:custom_field_enumerations]) do |enumeration, enumeration_attributes|
-      enumeration.safe_attributes = enumeration_attributes
-    end
-    if saved
-      flash[:notice] = l(:notice_successful_update)
-    end
-    redirect_to :action => 'index'
-  end
-
-  def destroy
-    reassign_to = @custom_field.enumerations.find_by_id(params[:reassign_to_id])
-    if reassign_to.nil? && @value.in_use?
-      @enumerations = @custom_field.enumerations - [@value]
-      render :action => 'destroy'
-      return
-    end
-    @value.destroy(reassign_to)
-    redirect_to custom_field_enumerations_path(@custom_field)
-  end
-
-  private
-
-  def find_custom_field
-    @custom_field = CustomField.find(params[:custom_field_id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
-  def find_enumeration
-    @value = @custom_field.enumerations.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end

data/spec/redmine/app/controllers/imports_controller.rb

@@ -1,121 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
-#
-# 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.
-
-require 'csv'
-
-class ImportsController < ApplicationController
-
-  before_action :find_import, :only => [:show, :settings, :mapping, :run]
-  before_action :authorize_global
-
-  helper :issues
-  helper :queries
-
-  def new
-  end
-
-  def create
-    @import = IssueImport.new
-    @import.user = User.current
-    @import.file = params[:file]
-    @import.set_default_settings
-
-    if @import.save
-      redirect_to import_settings_path(@import)
-    else
-      render :action => 'new'
-    end
-  end
-
-  def show
-  end
-
-  def settings
-    if request.post? && @import.parse_file
-      redirect_to import_mapping_path(@import)
-    end
-
-  rescue CSV::MalformedCSVError => e
-    flash.now[:error] = l(:error_invalid_csv_file_or_settings)
-  rescue ArgumentError, Encoding::InvalidByteSequenceError => e
-    flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding']))
-  rescue SystemCallError => e
-    flash.now[:error] = l(:error_can_not_read_import_file)
-  end
-
-  def mapping
-    @custom_fields = @import.mappable_custom_fields
-
-    if request.post?
-      respond_to do |format|
-        format.html {
-          if params[:previous]
-            redirect_to import_settings_path(@import)
-          else
-            redirect_to import_run_path(@import)
-          end
-        }
-        format.js # updates mapping form on project or tracker change
-      end
-    end
-  end
-
-  def run
-    if request.post?
-      @current = @import.run(
-        :max_items => max_items_per_request,
-        :max_time => 10.seconds
-      )
-      respond_to do |format|
-        format.html {
-          if @import.finished?
-            redirect_to import_path(@import)
-          else
-            redirect_to import_run_path(@import)
-          end
-        }
-        format.js
-      end
-    end
-  end
-
-  private
-
-  def find_import
-    @import = Import.where(:user_id => User.current.id, :filename => params[:id]).first
-    if @import.nil?
-      render_404
-      return
-    elsif @import.finished? && action_name != 'show'
-      redirect_to import_path(@import)
-      return
-    end
-    update_from_params if request.post?
-  end
-
-  def update_from_params
-    if params[:import_settings].is_a?(Hash)
-      @import.settings ||= {}
-      @import.settings.merge!(params[:import_settings])
-      @import.save!
-    end
-  end
-
-  def max_items_per_request
-    5
-  end
-end

data/spec/redmine/app/helpers/imports_helper.rb

@@ -1,47 +0,0 @@
-# encoding: utf-8
-#
-# Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
-#
-# 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.
-
-module ImportsHelper
-  def options_for_mapping_select(import, field, options={})
-    tags = "".html_safe
-    blank_text = options[:required] ? "-- #{l(:actionview_instancetag_blank_option)} --" : " ".html_safe
-    tags << content_tag('option', blank_text, :value => '')
-    tags << options_for_select(import.columns_options, import.mapping[field])
-    if values = options[:values]
-      tags << content_tag('option', '--', :disabled => true)
-      tags << options_for_select(values.map {|text, value| [text, "value:#{value}"]}, import.mapping[field])
-    end
-    tags
-  end
-
-  def mapping_select_tag(import, field, options={})
-    name = "import_settings[mapping][#{field}]"
-    select_tag name, options_for_mapping_select(import, field, options), :id => "import_mapping_#{field}"
-  end
-
-  # Returns the options for the date_format setting
-  def date_format_options
-    Import::DATE_FORMATS.map do |f|
-      format = f.gsub('%', '').gsub(/[dmY]/) do
-        {'d' => 'DD', 'm' => 'MM', 'Y' => 'YYYY'}[$&]
-      end
-      [format, f]
-    end
-  end
-end

data/spec/redmine/app/models/custom_field_enumeration.rb

@@ -1,90 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
-#
-# 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.
-
-class CustomFieldEnumeration < ActiveRecord::Base
-  include Redmine::SafeAttributes
-
-  belongs_to :custom_field
-  attr_accessible :name, :active, :position
-
-  validates_presence_of :name, :position, :custom_field_id
-  validates_length_of :name, :maximum => 60
-  validates_numericality_of :position, :only_integer => true
-  before_create :set_position
-
-  scope :active, lambda { where(:active => true) }
-
-  safe_attributes 'name',
-    'active',
-    'position'
-
-  def to_s
-    name.to_s
-  end
-
-  def objects_count
-    custom_values.count
-  end
-
-  def in_use?
-    objects_count > 0
-  end
-
-  alias :destroy_without_reassign :destroy
-  def destroy(reassign_to=nil)
-    if reassign_to
-      custom_values.update_all(:value => reassign_to.id.to_s)
-    end
-    destroy_without_reassign
-  end
-
-  def custom_values
-    custom_field.custom_values.where(:value => id.to_s)
-  end
-
-  def self.update_each(custom_field, attributes)
-    return unless attributes.is_a?(Hash)
-    transaction do
-      attributes.each do |enumeration_id, enumeration_attributes|
-        enumeration = custom_field.enumerations.find_by_id(enumeration_id)
-        if enumeration
-          if block_given?
-            yield enumeration, enumeration_attributes
-          else
-            enumeration.attributes = enumeration_attributes
-          end
-          unless enumeration.save
-            raise ActiveRecord::Rollback
-          end
-        end
-      end
-    end
-  end
-
-  def self.fields_for_order_statement(table=nil)
-    table ||= table_name
-    columns = ['position']
-    columns.uniq.map {|field| "#{table}.#{field}"}
-  end
-
-  private
-
-  def set_position
-    max = self.class.where(:custom_field_id => custom_field_id).maximum(:position) || 0
-    self.position = max + 1
-  end
-end

data/spec/redmine/app/models/import.rb

@@ -1,249 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2016  Jean-Philippe Lang
-#
-# 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.
-
-require 'csv'
-
-class Import < ActiveRecord::Base
-  has_many :items, :class_name => 'ImportItem', :dependent => :delete_all
-  belongs_to :user
-  serialize :settings
-
-  before_destroy :remove_file
-
-  validates_presence_of :filename, :user_id
-  validates_length_of :filename, :maximum => 255
-
-  DATE_FORMATS = [
-    '%Y-%m-%d',
-    '%d/%m/%Y',
-    '%m/%d/%Y',
-    '%d.%m.%Y',
-    '%d-%m-%Y'
-  ]
-
-  def initialize(*args)
-    super
-    self.settings ||= {}
-  end
-
-  def file=(arg)
-    return unless arg.present? && arg.size > 0
-
-    self.filename = generate_filename
-    Redmine::Utils.save_upload(arg, filepath)
-  end
-
-  def set_default_settings
-    separator = lu(user, :general_csv_separator)
-    if file_exists?
-      begin
-        content = File.read(filepath, 256)
-        separator = [',', ';'].sort_by {|sep| content.count(sep) }.last
-      rescue Exception => e
-      end
-    end
-    wrapper = '"'
-    encoding = lu(user, :general_csv_encoding)
-
-    date_format = lu(user, "date.formats.default", :default => "foo")
-    date_format = DATE_FORMATS.first unless DATE_FORMATS.include?(date_format)
-
-    self.settings.merge!(
-      'separator' => separator,
-      'wrapper' => wrapper,
-      'encoding' => encoding,
-      'date_format' => date_format
-    )
-  end
-
-  def to_param
-    filename
-  end
-
-  # Returns the full path of the file to import
-  # It is stored in tmp/imports with a random hex as filename
-  def filepath
-    if filename.present? && filename =~ /\A[0-9a-f]+\z/
-      File.join(Rails.root, "tmp", "imports", filename)
-    else
-      nil
-    end
-  end
-
-  # Returns true if the file to import exists
-  def file_exists?
-    filepath.present? && File.exists?(filepath)
-  end
-
-  # Returns the headers as an array that
-  # can be used for select options
-  def columns_options(default=nil)
-    i = -1
-    headers.map {|h| [h, i+=1]}
-  end
-
-  # Parses the file to import and updates the total number of items
-  def parse_file
-    count = 0
-    read_items {|row, i| count=i}
-    update_attribute :total_items, count
-    count
-  end
-
-  # Reads the items to import and yields the given block for each item
-  def read_items
-    i = 0
-    headers = true
-    read_rows do |row|
-      if i == 0 && headers
-        headers = false
-        next
-      end
-      i+= 1
-      yield row, i if block_given?
-    end
-  end
-
-  # Returns the count first rows of the file (including headers)
-  def first_rows(count=4)
-    rows = []
-    read_rows do |row|
-      rows << row
-      break if rows.size >= count
-    end
-    rows
-  end
-
-  # Returns an array of headers
-  def headers
-    first_rows(1).first || []
-  end
-
-  # Returns the mapping options
-  def mapping
-    settings['mapping'] || {}
-  end
-
-  # Imports items and returns the position of the last processed item
-  def run(options={})
-    max_items = options[:max_items]
-    max_time = options[:max_time]
-    current = 0
-    imported = 0
-    resume_after = items.maximum(:position) || 0
-    interrupted = false
-    started_on = Time.now
-
-    read_items do |row, position|
-      if (max_items && imported >= max_items) || (max_time && Time.now >= started_on + max_time)
-        interrupted = true
-        break
-      end
-      if position > resume_after
-        item = items.build
-        item.position = position
-
-        if object = build_object(row)
-          if object.save
-            item.obj_id = object.id
-          else
-            item.message = object.errors.full_messages.join("\n")
-          end
-        end
-
-        item.save!
-        imported += 1
-      end
-      current = position
-    end
-
-    if imported == 0 || interrupted == false
-      if total_items.nil?
-        update_attribute :total_items, current
-      end
-      update_attribute :finished, true
-      remove_file
-    end
-
-    current
-  end
-
-  def unsaved_items
-    items.where(:obj_id => nil)
-  end
-
-  def saved_items
-    items.where("obj_id IS NOT NULL")
-  end
-
-  private
-
-  def read_rows
-    return unless file_exists?
-
-    csv_options = {:headers => false}
-    csv_options[:encoding] = settings['encoding'].to_s.presence || 'UTF-8'
-    separator = settings['separator'].to_s
-    csv_options[:col_sep] = separator if separator.size == 1
-    wrapper = settings['wrapper'].to_s
-    csv_options[:quote_char] = wrapper if wrapper.size == 1
-
-    CSV.foreach(filepath, csv_options) do |row|
-      yield row if block_given?
-    end
-  end
-
-  def row_value(row, key)
-    if index = mapping[key].presence
-      row[index.to_i].presence
-    end
-  end
-
-  def row_date(row, key)
-    if s = row_value(row, key)
-      format = settings['date_format']
-      format = DATE_FORMATS.first unless DATE_FORMATS.include?(format)
-      Date.strptime(s, format) rescue s
-    end
-  end
-
-  # Builds a record for the given row and returns it
-  # To be implemented by subclasses
-  def build_object(row)
-  end
-
-  # Generates a filename used to store the import file
-  def generate_filename
-    Redmine::Utils.random_hex(16)
-  end
-
-  # Deletes the import file
-  def remove_file
-    if file_exists?
-      begin
-        File.delete filepath
-      rescue Exception => e
-        logger.error "Unable to delete file #{filepath}: #{e.message}" if logger
-      end
-    end
-  end
-
-  # Returns true if value is a string that represents a true value
-  def yes?(value)
-    value == lu(user, :general_text_yes) || value == '1'
-  end
-end