redmine_extensions 0.0.34 → 0.0.36

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.0.34'
+  VERSION = '0.0.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.36
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,7 @@ files:
 - app/assets/javascripts/redmine_extensions/application.js
 - app/assets/javascripts/redmine_extensions/jquery.entityarray.js
 - app/assets/javascripts/redmine_extensions/redmine_extensions.js
+- app/assets/javascripts/redmine_extensions/redmine_extensions.js.orig
 - app/assets/stylesheets/redmine_extensions/application.css
 - app/controllers/easy_settings_controller.rb
 - app/helpers/redmine_extensions/application_helper.rb
@@ -117,10 +118,8 @@ files:
 - app/presenters/redmine_extensions/base_presenter.rb
 - app/presenters/redmine_extensions/easy_setting_presenter.rb
 - app/views/easy_entity_assignments/_assignments_container.html.erb
-- app/views/easy_entity_assignments/_assignments_container.html.erb.orig
 - app/views/easy_entity_assignments/_query_index.html.erb
 - app/views/easy_queries/_entities.html.erb
-- app/views/easy_queries/_entities.html.erb.orig
 - app/views/easy_queries/_index.html.erb
 - app/views/easy_queries/_settings.html.erb
 - app/views/easy_settings/edit.html.erb
@@ -178,7 +177,6 @@ files:
 - lib/redmine_extensions/easy_entity_formatters/easy_entity_formatter.rb
 - lib/redmine_extensions/easy_form_builder.rb
 - lib/redmine_extensions/easy_query_adapter.rb
-- lib/redmine_extensions/easy_query_adapter.rb.orig
 - lib/redmine_extensions/engine.rb
 - lib/redmine_extensions/export/easy_other_formats_builder.rb
 - lib/redmine_extensions/hooks.rb
@@ -195,7 +193,6 @@ files:
 - lib/redmine_extensions/redmine_patches/controllers/issues_controller_patch.rb
 - lib/redmine_extensions/redmine_patches/patches.rb
 - lib/redmine_extensions/version.rb
-- lib/redmine_extensions/version.rb.orig
 - lib/tasks/redmine_extensions_tasks.rake
 - spec/factories/easy_queries.rb
 - spec/factories/easy_settings.rb
@@ -209,7 +206,6 @@ files:
 - spec/rails_helper.rb
 - spec/redmine/CONTRIBUTING.md
 - spec/redmine/Gemfile
-- spec/redmine/Gemfile.lock
 - spec/redmine/README.rdoc
 - spec/redmine/Rakefile
 - spec/redmine/app/controllers/account_controller.rb
@@ -837,9 +833,7 @@ files:
 - spec/redmine/config/locales/zh-TW.yml
 - spec/redmine/config/locales/zh.yml
 - spec/redmine/config/routes.rb
-- spec/redmine/config/secrets.yml
 - spec/redmine/config/settings.yml
-- spec/redmine/db/development.sqlite3
 - spec/redmine/db/migrate/001_setup.rb
 - spec/redmine/db/migrate/002_issue_move.rb
 - spec/redmine/db/migrate/003_issue_add_note.rb
@@ -1092,8 +1086,6 @@ files:
 - spec/redmine/db/migrate/20150528084820_add_roles_all_roles_managed.rb
 - spec/redmine/db/migrate/20150528092912_create_roles_managed_roles.rb
 - spec/redmine/db/migrate/20150528093249_add_unique_index_on_roles_managed_roles.rb
-- spec/redmine/db/schema.rb
-- spec/redmine/db/test.sqlite3
 - spec/redmine/doc/CHANGELOG
 - spec/redmine/doc/COPYING
 - spec/redmine/doc/INSTALL
@@ -1323,21 +1315,7 @@ files:
 - spec/redmine/lib/tasks/testing.rake
 - spec/redmine/lib/tasks/yardoc.rake
 - spec/redmine/log/delete.me
-- spec/redmine/log/development.log
-- spec/redmine/log/test.scm.stderr.log
 - spec/redmine/plugins/README
-- spec/redmine/plugins/easy_test_plugin/Gemfile
-- spec/redmine/plugins/easy_test_plugin/app/controllers/easy_issue_tests_controller.rb
-- spec/redmine/plugins/easy_test_plugin/app/models/easy_testing_query.rb
-- spec/redmine/plugins/easy_test_plugin/app/views/easy_issue_tests/index.html.erb
-- spec/redmine/plugins/easy_test_plugin/config/locales/en.yml
-- spec/redmine/plugins/easy_test_plugin/config/routes.rb
-- spec/redmine/plugins/easy_test_plugin/init.rb
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/hooks.rb
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/internals.rb
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/controllers/issues_controller_patch.example
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/helpers/issues_helper_patch.example
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/models/issue_patch.example
 - spec/redmine/public/404.html
 - spec/redmine/public/500.html
 - spec/redmine/public/dispatch.fcgi.example
@@ -1773,10 +1751,6 @@ files:
 - spec/redmine/public/javascripts/jstoolbar/textile.js
 - spec/redmine/public/javascripts/project_identifier.js
 - spec/redmine/public/javascripts/raphael.js
-- spec/redmine/public/javascripts/redmine_extensions/application.js
-- spec/redmine/public/javascripts/redmine_extensions/jquery.easy_query.js
-- spec/redmine/public/javascripts/redmine_extensions/jquery.entityarray.js
-- spec/redmine/public/javascripts/redmine_extensions/redmine_extensions.js
 - spec/redmine/public/javascripts/repository_navigation.js
 - spec/redmine/public/javascripts/revision_graph.js
 - spec/redmine/public/plugin_assets/empty
@@ -2217,6 +2191,9 @@ files:
 - spec/redmine/test/unit/wiki_test.rb
 - spec/redmine/test/unit/workflow_test.rb
 - spec/redmine/test/unit/workflow_transition_test.rb
+- spec/redmine/tmp/pdf/empty
+- spec/redmine/tmp/test/empty
+- spec/redmine/tmp/thumbnails/empty
 - spec/spec_helper.rb
 - spec/support/easy_queries_helpers.rb
 homepage: https://www.easyredmine.com
@@ -2665,9 +2642,6 @@ test_files:
 - spec/redmine/doc/COPYING
 - spec/redmine/doc/README_FOR_APP
 - spec/redmine/doc/RUNNING_TESTS
-- spec/redmine/db/test.sqlite3
-- spec/redmine/db/development.sqlite3
-- spec/redmine/db/schema.rb
 - spec/redmine/db/migrate/20091017214611_add_missing_indexes_to_journals.rb
 - spec/redmine/db/migrate/047_add_boards_permissions.rb
 - spec/redmine/db/migrate/005_issue_start_date.rb
@@ -2923,7 +2897,6 @@ test_files:
 - spec/redmine/Gemfile
 - spec/redmine/config/environment.rb
 - spec/redmine/config/configuration.yml.example
-- spec/redmine/config/secrets.yml
 - spec/redmine/config/environments/test_pgsql.rb
 - spec/redmine/config/environments/development.rb
 - spec/redmine/config/environments/test_sqlite3.rb
@@ -2991,7 +2964,6 @@ test_files:
 - spec/redmine/config/locales/th.yml
 - spec/redmine/config/locales/cs.yml
 - spec/redmine/config/locales/he.yml
-- spec/redmine/Gemfile.lock
 - spec/redmine/public/500.html
 - spec/redmine/public/javascripts/context_menu.js
 - spec/redmine/public/javascripts/project_identifier.js
@@ -3098,10 +3070,6 @@ test_files:
 - spec/redmine/public/javascripts/jstoolbar/textile.js
 - spec/redmine/public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.3.js
 - spec/redmine/public/javascripts/gantt.js
-- spec/redmine/public/javascripts/redmine_extensions/jquery.entityarray.js
-- spec/redmine/public/javascripts/redmine_extensions/redmine_extensions.js
-- spec/redmine/public/javascripts/redmine_extensions/jquery.easy_query.js
-- spec/redmine/public/javascripts/redmine_extensions/application.js
 - spec/redmine/public/javascripts/application.js
 - spec/redmine/public/plugin_assets/empty
 - spec/redmine/public/themes/classic/images/home.png
@@ -3478,23 +3446,12 @@ test_files:
 - spec/redmine/extra/sample_plugin/assets/images/it_works.png
 - spec/redmine/extra/sample_plugin/assets/stylesheets/example.css
 - spec/redmine/extra/mail_handler/rdm-mailhandler.rb
+- spec/redmine/tmp/pdf/empty
+- spec/redmine/tmp/test/empty
+- spec/redmine/tmp/thumbnails/empty
 - spec/redmine/files/delete.me
 - spec/redmine/plugins/README
-- spec/redmine/plugins/easy_test_plugin/init.rb
-- spec/redmine/plugins/easy_test_plugin/Gemfile
-- spec/redmine/plugins/easy_test_plugin/config/routes.rb
-- spec/redmine/plugins/easy_test_plugin/config/locales/en.yml
-- spec/redmine/plugins/easy_test_plugin/app/models/easy_testing_query.rb
-- spec/redmine/plugins/easy_test_plugin/app/controllers/easy_issue_tests_controller.rb
-- spec/redmine/plugins/easy_test_plugin/app/views/easy_issue_tests/index.html.erb
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/internals.rb
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/models/issue_patch.example
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/controllers/issues_controller_patch.example
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/redmine_patch/helpers/issues_helper_patch.example
-- spec/redmine/plugins/easy_test_plugin/lib/easy_test_plugin/hooks.rb
 - spec/redmine/README.rdoc
-- spec/redmine/log/development.log
-- spec/redmine/log/test.scm.stderr.log
 - spec/redmine/log/delete.me
 - spec/redmine/bin/rails
 - spec/redmine/bin/rake

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

@@ -1,45 +0,0 @@
-<%
-  heading = "#{options[:heading]} (#{entities_count})"
-%>
-<% if entities_count > 0 %>
-  <div id="<%= options[:module_name] %>_container" class="entity_references_container easy-dropper-target easy-drop-issue" data-drop-action="<%= entity.class.name.underscore %>" data-entity-id="<%= entity.id %>" data-issue-show="1">
-<<<<<<< HEAD
-    <%= call_hook(:view_easy_entity_assignemnt_top, :entity => entity, :query => query, :entities => entities, :options => options, :target_class => target_class) %>
-=======
-    <%= call_hook(:view_easy_entity_assignemnt_top, :entity => entity, :query => query, :entities => entities, :options => options) %>
->>>>>>> master
-    <div class="box">
-      <%# entity_cards_params = {:module_name => options[:module_name], :project_id => project, :source_entity_type => entity.class.name, :source_entity_id => entity, :referenced_entity_type => referenced_entity_type, :referenced_collection_name => options[:referenced_collection_name]}.merge!(query.to_params) %>
-      <% entity_cards_params = {} %>
-      <%= render_toggler(options[:module_name], User.current, {:heading => heading + ':', :wrapping_heading_element_classes => entity_css_icon(query.entity),
-                                                                   :container_html => {:class => 'module-inside'}, :default_button_state => false, :heading_links => [
-                                                      link_to('', {}, :class => 'icon-slab', :remote => true, :data => {:display => 'slab'}, :title => l(:title_easy_card_display_changer_tile)),
-                                                      link_to('', {}, :class => 'icon-bullet-list', :remote => true, :data => {:display => 'list'}, :title => l(:title_easy_card_display_changer_list))
-                                                    ]}) do %>
-
-
-<<<<<<< HEAD
-          <%= render(:partial => 'easy_entity_assignments/query_index', :locals => {
-                                                                      :entity => entity,
-                                                                      :query => query, :target_class => target_class,
-                                                                      :project => project, :options => options, :referenced_entities => entities}) %>
-
-=======
-        <%#= render(:partial => 'easy_entity_assignments/query_index', :locals => {
-                                                                    :entity => entity,
-                                                                    :query => query, :target_class => target_class,
-                                                                    :project => project, :options => options, :referenced_entities => entities}) %>
-        <% entities.each do |entity| %>
-          <div>
-            <%= entity.to_s %>
-          </div>
-        <% end %>
->>>>>>> master
-
-        <% if options[:context_menus_path] && respond_to?(options[:context_menus_path]) %>
-          <%# context_menu(send(options[:context_menus_path], {:project_id => project, :back_url => url_for(params)}), "##{options[:module_name]}_container") -%>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-<% end %>

data/app/views/easy_queries/_entities.html.erb.orig

@@ -1,67 +0,0 @@
-<%= form_tag({}) do %>
-  <%= hidden_field_tag 'back_url', url_for(params), id: nil %>
-
-  <div class="autoscroll">
-    <table class="list <%= sort_css_classes %>">
-      <thead>
-        <tr>
-          <th class="checkbox hide-when-print">
-            <%= link_to_function image_tag('toggle_check.png'), 'toggleIssuesSelection(this)' %>
-          </th>
-
-          <% query.inline_columns.each do |column| %>
-            <%= column_header(column) %>
-          <% end %>
-
-          <% if query.ending_buttons? %>
-            <th></th>
-          <% end %>
-        </tr>
-      </thead>
-
-      <tbody>
-        <% entities.each do |entity| %>
-
-          <tr id="entity-<%= entity.id %>" class="hascontextmenu <%= cycle('odd', 'even') %>">
-            <td class="checkbox hide-when-print">
-              <%= check_box_tag('ids[]', entity.id, false, id: nil) %>
-            </td>
-
-            <% query.inline_columns.each do |column| %>
-              <td>
-<<<<<<< HEAD
-                <%= query.formatter.format(column, entity) %>
-=======
-                <%= formatter.format_column(column, entity) %>
->>>>>>> master
-              </td>
-            <% end %>
-
-            <% if query.ending_buttons? %>
-              <td>
-                <%= query.ending_buttons(entity) %>
-              </td>
-            <% end %>
-          </tr>
-
-          <% query.block_columns.each do |column| %>
-<<<<<<< HEAD
-            <% text = query.formatter.format(column, entity) %>
-            <% if text.present? %>
-              <tr class="<%= current_cycle %>">
-                <td colspan="<%= @query.inline_columns.size + (query.ending_buttons? ? 2 : 1) %>"><%= text %></td>
-=======
-            <% text = formatter.format_column(column, entity) %>
-            <% if text.present? %>
-              <tr class="<%= current_cycle %>">
-                <td colspan="<%= query.inline_columns.size + (formatter.ending_buttons? ? 2 : 1) %>"><%= text %></td>
->>>>>>> master
-              </tr>
-            <% end %>
-          <% end %>
-
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% end %>

data/lib/redmine_extensions/easy_query_adapter.rb.orig

@@ -1,185 +0,0 @@
-require 'query'
-
-module RedmineExtensions
-  module QueryColumnAdapter
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.send(:include, InstanceMethods)
-
-      base.class_eval do
-        attr_accessor :includes
-        attr_accessor :joins
-        attr_accessor :preload
-      end
-    end
-
-    module InstanceMethods
-    end
-
-    module ClassMethods
-    end
-  end
-
-  module QueryAdapter
-
-    # after_initialize :after_initialize
-
-<<<<<<< HEAD
-  attr_writer :outputs
-
-  def after_initialize
-    self.filters ||= {}
-  end
-
-  def outputs
-    @outputs ||= ['list']
-  end
-
-  def output=(output_t)
-    self.outputs = Array.wrap(output_t)
-  end
-
-  def default_find_include
-    [].freeze
-  end
-=======
-    # def after_initialize
-    #   self.filters ||= {}
-    # end
-
-    def filters
-      super || {}
-    end
->>>>>>> master
-
-    def default_find_include
-      [].freeze
-    end
-
-    def default_find_preload
-      [].freeze
-    end
-
-    def default_find_joins
-      [].freeze
-    end
-
-    def default_list_columns
-      [].freeze
-    end
-
-    def formatter
-      @formatter
-    end
-
-    def init_formatter(object)
-      return @formatter if @formatter
-
-      if entity
-        begin
-          formatter_klass = "#{entity}Formatter".constantize
-        rescue NameError
-        end
-      end
-
-      formatter_klass ||= EasyEntityFormatter
-      @formatter = formatter_klass.new(object)
-    end
-
-    def entity
-      self.class.queried_class
-    end
-
-    def entity_scope
-      if !@entity_scope.nil?
-        @entity_scope
-      elsif entity.respond_to?(:visible)
-        entity.visible
-      else
-        entity
-      end
-    end
-
-    def set_entity_scope(entity, reference_collection = nil)
-      return nil if entity.nil? || reference_collection.nil?
-
-      @entity_scope = entity.send(reference_collection.to_sym)
-
-      self.filters = {}
-
-      @entity_scope
-    end
-
-    def create_entity_scope(options={})
-      scope = entity_scope.where(statement)
-
-      includes = default_find_include.dup
-      includes.concat(Array.wrap(options[:includes]))
-
-      preload = default_find_preload.dup
-      preload.concat(Array.wrap(options[:preload]))
-
-      joins = default_find_joins.dup
-      joins.concat(Array.wrap(options[:joins]))
-
-      filters.keys.each do |filter|
-        f = available_filters[filter]
-        next if f.blank?
-
-        includes.concat(Array.wrap(f[:includes])) if f[:includes]
-        joins.concat(Array.wrap(f[:joins])) if f[:joins]
-      end if filters
-
-      columns.each do |c|
-        includes.concat(Array.wrap(c.includes)) if c.includes
-        joins.concat(Array.wrap(c.joins)) if c.joins
-        preload.concat(Array.wrap(c.preload)) if c.preload
-      end
-
-      if project
-        includes << :project
-      end
-
-      includes.uniq!
-      joins.uniq!
-      preload.uniq!
-
-      scope.includes(includes).references(includes).joins(joins).preload(preload)
-    end
-
-    def entities(options={})
-      create_entity_scope(options).order(options[:order]).to_a
-    end
-
-    def add_available_column(name, options={})
-      @available_columns ||= []
-
-      @available_columns << QueryColumn.new(name.to_sym, options)
-    end
-
-    def to_partial_path
-      'easy_queries/index'
-    end
-
-    def default_columns_names
-      default_list_columns
-    end
-
-    def queried_table_name
-      entity.table_name
-    end
-
-  end
-
-end
-
-class EasyQueryAdapter < Query
-end
-
-if Redmine::Plugin.installed?(:easy_extensions)
-  # EasyQuery exist
-else
-  QueryColumn.send(:include, RedmineExtensions::QueryColumnAdapter)
-  RedmineExtensions::PatchManager.register_model_patch('Query', "RedmineExtensions::QueryAdapter")
-  EasyQuery = EasyQueryAdapter
-end