redmine_extensions 0.1.14 → 0.1.15

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

@@ -0,0 +1,16 @@
+<<<<<<< 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/config/locales/cs.yml

@@ -1,3 +1,6 @@
 cs:
-  nothing: Nothing
+  nothing: Nic
   button_update_easy_settings: Uložit nastavení
+  label_no_output: Nebyl vybrán žádný výstup
+  label_easy_query_outputs: Výstupy
+  text_modal_is_closing: Vyčkejte prosím, toto okno bude zavřeno automaticky.

data/config/locales/en.yml

@@ -2,4 +2,5 @@ en:
   nothing: Nothing
   button_update_easy_settings: Update settings
   label_no_output: No output has been selected
+  label_easy_query_outputs: Outputs
   text_modal_is_closing: This modal dialog will be closed automatically, please wait.

data/lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb

@@ -2,7 +2,20 @@
 <%% if @<%= model_name_underscored %> -%>
   <li><%%= context_menu_link l(:button_edit), edit_<%= model_name_underscored %>_path(@<%= model_name_underscored %>), class: 'icon icon-edit', disabled: !@can[:edit] %></li>
 <%% end %>
+<%% if @safe_attributes.include? 'status' -%>
+  <li class="folder">
+    <a href="#" class="submenu icon icon-issue-status" onclick="return false;"><%%= l(:field_status) -%></a>
+    <ul>
+      <%% <%= model_name %>.statuses.keys.each do |s| -%>
+        <li>
+          <%%= context_menu_link l("<%= model_name_underscored %>.statuses.#{s}"), bulk_update_<%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, <%= model_name_underscored %>: {status: s}, back_url: @back), method: :put,
+                                  selected: (@selected[:status] == s), disabled: !@can[:edit], confirm: l(:text_are_you_sure) %>
+        </li>
+      <%% end -%>
+    </ul>
+  </li>
+  <%% end %>
   <li><%%= context_menu_link l(:button_delete), <%= model_name_pluralize_underscored %>_path(ids: @<%= model_name_underscored %>_ids, back_url: @back), method: :delete, data: {confirm: l(:text_are_you_sure)}, class: 'icon icon-del', disabled: !@can[:delete] %></li>
 
   <%%= call_hook(:view_<%= model_name_pluralize_underscored %>_context_menu_end, {<%= model_name_underscored %>: @<%= model_name_underscored %>, <%= model_name_pluralize_underscored %>: @<%= model_name_pluralize_underscored %>, can: @can, back: @back, project: @project}) %>
-</ul>
+</ul>

data/lib/generators/redmine_extensions/entity/templates/controller.rb.erb

@@ -121,22 +121,56 @@ class <%= controller_class %>Controller < ApplicationController
   end
 
   def bulk_update
+    unsaved, saved = [], []
+    attributes = parse_params_for_bulk_update([:<%= model_name_underscored %>])
+    @<%= model_name_pluralize_underscored %>.each do |entity|
+      entity.init_journal(User.current) if entity.respond_to? :init_journal
+      entity.safe_attributes = attributes
+      if entity.save
+        saved << entity
+        else
+        unsaved << entity
+      end
+    end
+    respond_to do |format|
+      format.html do
+        if unsaved.blank?
+          flash[:notice] = l(:notice_successful_update)
+        else
+          flash[:error] = unsaved.map{|i| i.errors.full_messages}.flatten.uniq.join(",\n")
+        end
+        redirect_back_or_default :index
+      end
+    end
   end
 
   def context_menu
-    if (@<%= model_name_pluralize_underscored %>.size == 1)
-      @<%= model_name_underscored %> = @<%= model_name_pluralize_underscored %>.first
+    if @<%= model_name_pluralize_underscored %>.size == 1
+      @easy_tenant = @<%= model_name_pluralize_underscored %>.first
     end
-    @<%= model_name_underscored %>_ids = @<%= model_name_pluralize_underscored %>.map(&:id).sort
 
     can_edit = @<%= model_name_pluralize_underscored %>.detect{|c| !c.editable?}.nil?
     can_delete = @<%= model_name_pluralize_underscored %>.detect{|c| !c.deletable?}.nil?
-    @can = {:edit => can_edit, :delete => can_delete}
+    @can = {edit: can_edit, delete: can_delete}
     @back = back_url
 
-    @safe_attributes = @<%= model_name_pluralize_underscored %>.map(&:safe_attribute_names).reduce(:&)
+    @<%= model_name_underscored %>_ids, @safe_attributes, @selected = [], [], {}
+    @<%= model_name_pluralize_underscored %>.each do |e|
+      @<%= model_name_underscored %>_ids << e.id
+      @safe_attributes.concat e.safe_attribute_names(User.current)
+      <%= model_name %>.safe_attribute_names.each do |c|
+        column_name = c.to_sym
+        if @selected.key? column_name
+          @selected[column_name] = nil if @selected[column_name] != e.send(column_name)
+        else
+          @selected[column_name] = e.send(column_name)
+        end
+      end
+    end
+
+    @safe_attributes.uniq!
 
-    render :layout => false
+    render layout: false
   end
 
   def autocomplete

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -1,17 +1,17 @@
 $("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
 showModal('ajax-modal');
 var submitButton = {
-  text:"<%=j l(:button_update) -%>",
-  title:"<%=j l(:button_update) -%>",
+  text:"<%%=j l(:button_update) -%%>",
+  title:"<%%=j l(:button_update) -%%>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
 }
 var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) -%%>",
+  title: "<%%=j l(:button_close) -%%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 }
 $("#ajax-modal").dialog('option', {
   buttons: [closeButton, submitButton]
-});
+});

data/lib/generators/redmine_extensions/entity/templates/index.js.erb.erb

@@ -1,11 +1,11 @@
 $("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/index', :formats => [:html]) %>");
 showModal('ajax-modal');
 var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) -%%>",
+  title: "<%%=j l(:button_close) -%%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 }
 $("#ajax-modal").dialog('option', {
   buttons: [closeButton, submitButton]
-});
+});

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -1,17 +1,17 @@
 $("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
 showModal('ajax-modal');
 var submitButton = {
-  text:"<%=j l(:button_create) -%>",
-  title:"<%=j l(:button_create) -%>",
+  text:"<%%=j l(:button_create) -%%>",
+  title:"<%%=j l(:button_create) -%%>",
   click: function() {$(this).find('form').submit()},
   'class': 'button-positive'
 }
 var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) -%%>",
+  title: "<%%=j l(:button_close) -%%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 }
 $("#ajax-modal").dialog('option', {
   buttons: [closeButton, submitButton]
-});
+});

data/lib/generators/redmine_extensions/entity/templates/show.js.erb.erb

@@ -1,11 +1,11 @@
 $("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/show', :formats => [:html]) %>");
 showModal('ajax-modal');
 var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
+  text: "<%%=j l(:button_close) -%%>",
+  title: "<%%=j l(:button_close) -%%>",
   click: function() {$(this).dialog('close');},
   'class': 'button'
 }
 $("#ajax-modal").dialog('option', {
   buttons: [closeButton, submitButton]
-});
+});

data/lib/redmine_extensions/easy_query_helpers/outputs.rb

@@ -31,7 +31,8 @@ module RedmineExtensions
       end
 
       def enabled_outputs
-        res = @query.outputs
+        res = available_output_names.map(&:to_s) if available_output_names.count == 1
+        res ||= @query.outputs
         res << 'list' if res.empty? && available_outputs.empty?
         res
       end
@@ -49,7 +50,18 @@ module RedmineExtensions
       end
 
       def render_edit_selects(style=:check_box, options={})
-        available_output_instances.map{|o| o.render_edit_box(style, options) }.join('').html_safe
+        options.delete(:enabled)
+        if available_outputs.count == 1
+          available_outputs.first.render_edit_box(:hidden_field, options)
+        else
+          h.content_tag(:p) do
+            s = h.content_tag(:label, h.l(:label_easy_query_outputs))
+            available_outputs.each do |o|
+              s << o.render_edit_box(style, options.dup)
+            end
+            s
+          end
+        end
       end
 
       def render_edit
@@ -64,6 +76,10 @@ module RedmineExtensions
         end
       end
 
+      def h
+        view_context
+      end
+
       def method_missing(name, *args)
         if name.to_s.ends_with?('?')
           output_enabled?(name.to_s[0..-2])

data/lib/redmine_extensions/query_output.rb

@@ -4,11 +4,6 @@ module RedmineExtensions
     attr_accessor :query
     delegate :options, to: :query
 
-    def self.register_output(klass, options={})
-      register_as = (options[:as] || klass.key).to_sym
-      registered_outputs[register_as] = klass
-    end
-
     def self.registered_outputs
       @@registered_outputs ||= {}
     end
@@ -17,6 +12,15 @@ module RedmineExtensions
       @@registered_per_query ||= {}
     end
 
+    def self.registered_whitelists
+      @@registered_whitelists ||= {}
+    end
+
+    def self.register_output(klass, options={})
+      register_as = (options[:as] || klass.key).to_sym
+      registered_outputs[register_as] = klass
+    end
+
     def self.register_output_for_query(klass, query_class_names, **options)
       register_as ||= (options[:as] || klass.key).to_sym
       Array.wrap(query_class_names).each do |query_class_name|
@@ -25,8 +29,18 @@ module RedmineExtensions
       end
     end
 
+    def self.whitelist_outputs_for_query(query_class_names, outputs)
+      Array.wrap(query_class_names).each do |query_class_name|
+        registered_whitelists[query_class_name] ||= []
+        registered_whitelists[query_class_name].concat( Array.wrap(outputs).map(&:to_s) ).uniq!
+      end
+    end
+
     def self.filter_registered_for(query)
-      res = registered_outputs.select do |_name, output|
+      whitelist = registered_whitelists[query.type]
+      res = registered_outputs
+      res = res.slice(*whitelist.map(&:to_sym)) if whitelist
+      res = res.select do |name, output|
         output.available_for?(query)
       end
       res.merge(registered_per_query[query.type] || {})
@@ -94,16 +108,21 @@ module RedmineExtensions
     end
 
     def render_edit_box(style=:check_box, options={})
-      raise 'Style of edit box is not allowed' unless [:check_box, :radio_button].include?(style)
-
       box_id = "#{query.modul_uniq_id}output_#{key}"
 
-
       options[:class] = "#{options[:class]} #{query.modul_uniq_id}output_switch #{query.modul_uniq_id}content_switch"
       options[:enabled] = enabled? unless options.key?(:enabled)
+
       r = ''
-      r << h.send("#{style}_tag" , query.block_name.blank? ? 'outputs[]' : "#{query.block_name}[outputs][]", key, options[:enabled], id: box_id, class: options[:class])
-      r << h.label_tag(box_id, h.l('label_my_page_issue_output.' + key), :class => 'inline')
+      case style
+      when :hidden_field
+        r << h.hidden_field_tag(query.block_name.blank? ? 'outputs[]' : "#{query.block_name}[outputs][]", key, id: box_id, class: options[:class])
+      when :check_box, :radio_button
+        r << h.send("#{style}_tag" , query.block_name.blank? ? 'outputs[]' : "#{query.block_name}[outputs][]", key, options[:enabled], id: box_id, class: options[:class])
+        r << h.label_tag(box_id, h.l('label_my_page_issue_output.' + key), :class => 'inline')
+      else
+        raise 'Style of edit box is not allowed'
+      end
       r.html_safe
     end
 

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

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

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

data/lib/redmine_extensions/version.rb.orig

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

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

@@ -0,0 +1,75 @@
+# 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

@@ -0,0 +1,121 @@
+# 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