redmine_extensions 0.1.10 → 0.1.11

data/app/controllers/easy_settings_controller.rb

@@ -25,7 +25,7 @@ class EasySettingsController < ApplicationController
     Setting.send "plugin_#{@plugin.id}=", params[:settings] if params[:settings]
     if @easy_settings.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_back_or_default redmine_extensions_engine.edit_easy_setting_path(@easy_settings)
+      redirect_back_or_default edit_easy_setting_path(@easy_settings)
     else
       render :edit
     end

data/app/helpers/redmine_extensions/application_helper.rb

@@ -207,7 +207,7 @@ module RedmineExtensions
 
 
     def autocomplete_field_tag(name, jsonpath_or_array, selected_values, options = {})
-      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: true})
+      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: true, multiple: true})
       options[:id] ||= sanitize_to_id(name)
 
       selected_values ||= []
@@ -220,7 +220,7 @@ module RedmineExtensions
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
-          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
       end
     end
 

data/app/helpers/redmine_extensions/application_helper.rb.orig

@@ -0,0 +1,189 @@
+module RedmineExtensions
+  module ApplicationHelper
+    include RenderingHelper
+
+    # -------= Hack methods =------
+
+    def plugin_settings_path(plugin, *attrs)
+      if plugin.is_a?(Redmine::Plugin) && (plugin.settings[:only_easy] || plugin.settings[:easy_settings])
+        edit_easy_setting_path(plugin, *attrs)
+      else
+        super
+      end
+    end
+
+    # -------= Rendering and presenting methods =-------
+
+    def present(model, options={}, &block)
+      if model.is_a?(RedmineExtensions::BasePresenter)
+        presenter = model.update_options(options.merge(view_context: self))
+      else
+        presenter = RedmineExtensions::BasePresenter.present(model, self, options)
+      end
+      if block_given?
+        yield presenter
+      else
+        presenter
+      end
+    end
+
+    # --- COMMON RENDERING ----
+
+    # hide elements for issues and users
+    def detect_hide_elements(uniq_id, user = nil, default = true)
+      return ''.html_safe if uniq_id.blank?
+      return 'style="display:none"'.html_safe if !toggle_button_expanded?(uniq_id, user, default)
+    end
+
+    def url_to_entity(entity, options={})
+      m = "url_to_#{entity.class.name.underscore}".to_sym
+      if respond_to?(m)
+        send(m, entity, options)
+      else
+        nil
+      end
+    end
+
+    def render_entity_assignments(entity, target_class, options = {}, &block)
+      options ||= {}
+      collection_name = options.delete(:collection_name) || target_class.name.pluralize.underscore
+
+      project = options.delete(:project)
+      query_class = options.delete(:query_class)
+
+      if query_class.nil?
+        query_class_name = target_class.name + 'Query'
+
+        query_class = query_class_name.constantize #if Object.const_defined?(query_class_name)
+      end
+
+      return '' if !query_class || !(query_class < EasyQuery) || !entity.respond_to?(collection_name)
+
+      query = query_class.new(:name => 'c_query')
+      query.project = project
+      query.set_entity_scope(entity, collection_name)
+      query.column_names = options[:query_column_names] unless options[:query_column_names].blank?
+
+      entities = query.entities
+
+      entities_count = entities.size
+      options[:entities_count] = entities_count
+
+      options[:module_name] ||= "entity_#{entity.class.name.underscore}_#{entity.id}_#{collection_name}"
+      options[:heading] ||= l("label_#{target_class.name.underscore}_plural", :default => 'Heading')
+
+      if options[:context_menus_path].nil?
+        options[:context_menus_path] = [
+          "context_menu_#{collection_name}_path".to_sym,
+          "context_menus_#{collection_name}_path".to_sym,
+          "#{collection_name}_context_menu_path".to_sym
+        ].detect do |m|
+          m if respond_to?(m)
+        end
+      end
+
+      render(:partial => 'easy_entity_assignments/assignments_container', :locals => {
+        :entity => entity,
+        :query => query, :target_class => target_class, :project => project,
+        :entities => entities, :entities_count => entities_count, :options => options})
+    end
+
+    def entity_css_icon(entity_or_entity_class)
+      return '' if entity_or_entity_class.nil?
+
+      if entity_or_entity_class.is_a?(Class) && entity_or_entity_class.respond_to?(:css_icon)
+        entity_or_entity_class.css_icon
+      elsif entity_or_entity_class.is_a?(ActiveRecord::Base)
+        if entity_or_entity_class.respond_to?(:css_icon)
+          entity_or_entity_class.css_icon
+        elsif entity_or_entity_class.class.respond_to?(:css_icon)
+          entity_or_entity_class.class.css_icon
+        else
+          "icon icon-#{entity_or_entity_class.class.name.dasherize}"
+        end
+      else
+        "icon icon-#{entity_or_entity_class.class.name.dasherize}"
+      end
+    end
+
+    # options:
+    # => options[:heading] = text beside of plus button
+    # => options[:container_html] = a hash of html attributes
+    # => options[:default_button_state] = (true => expanded -), (false => collapsed +)
+    # => options[:ajax_call] = make ajax call for saving state (true => ajax call, false => no call, no save)
+    # => options[:wrapping_heading_element] = html element outside heading => h3, h4
+    def render_toggler(container_uniq_id, user = nil, options={}, &block)
+      user ||= User.current
+      options[:heading] ||= ''
+      options[:heading_links] ||= []
+      options[:heading_links] = [options[:heading_links]] if options[:heading_links] && !options[:heading_links].is_a?(Array)
+      options[:container_html] ||= {}
+      options[:default_button_state] = false #if is_mobile_device?
+      options[:default_button_state] = true if options[:default_button_state].nil?
+      options[:ajax_call] = true if options[:ajax_call].nil?
+
+      s = ''
+      if !options.key?(:no_heading_button)
+        options[:heading] << content_tag(:div, options[:heading_links].join(' ').html_safe, :class => 'module-heading-links') unless options[:heading_links].blank?
+        s << render_toggler_header(user, options[:heading].html_safe, container_uniq_id, options)
+      end
+
+      if options[:ajax_call] == false
+        expanded = options[:default_button_state]
+      else
+        expanded = true
+      end
+
+      s << (content_tag(:div, {
+        :id => container_uniq_id,
+        :style => (expanded ? '' : 'display:none')
+      }.merge(options[:container_html]) { |k, o, n| "#{o}; #{n}" }, &block))
+      s.html_safe
+    end
+
+    def render_toggler_header(user, content, modul_uniq_id, options={})
+      expander_options = options[:expander_options] || {}
+      wrapping_heading_element = options[:wrapping_heading_element] || 'h3'
+      wrapping_heading_element_classes = (options[:wrapping_heading_element_classes] || '') + ' module-heading'
+      wrapping_heading_element_styles = options[:wrapping_heading_element_styles]
+      ajax_call = options.delete(:ajax_call) ? 'true' : 'false'
+
+      html = ''
+
+      if options[:no_expander]
+        html << content_tag(wrapping_heading_element, content, :class => wrapping_heading_element_classes, :style => wrapping_heading_element_styles)
+      else
+        html << '<div class="module-toggle-button">'
+        html << "<div class='group open' >"
+        html << content_tag(wrapping_heading_element, content, :class => wrapping_heading_element_classes, :style => wrapping_heading_element_styles, :onclick => "var event = arguments[0] || window.event; if( !$(event.target).hasClass('do_not_toggle') && !$(event.target).parent().hasClass('module-heading-links') ) toggleMyPageModule(this,'#{modul_uniq_id}','#{user.id}', #{ajax_call})")
+        html << "<span class='expander #{expander_options[:class]}' onclick=\"toggleMyPageModule($(this),'#{modul_uniq_id}','#{user.id}', #{ajax_call}); return false;\" id=\"expander_#{modul_uniq_id}\">&nbsp;</span>"
+        html << '</div></div>'
+      end
+
+      html.html_safe
+    end
+
+    def autocomplete_field_tag(name, jsonpath_or_array, selected_values, options = {})
+      options.reverse_merge!({select_first_value: false, show_toggle_button: false, load_immediately: false, preload: true})
+      options[:id] ||= sanitize_to_id(name)
+
+      selected_values ||= []
+
+      if jsonpath_or_array.is_a?(Array)
+        source = jsonpath_or_array.to_json
+      else
+        source = "'#{jsonpath_or_array}'"
+      end
+
+      content_tag(:span, :class => 'easy-multiselect-tag-container') do
+        text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
+<<<<<<< HEAD
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: true, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+=======
+          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: true, rootElement: #{options[:rootElement]}, inputName: '#{name}', preload: #{options[:preload]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+>>>>>>> 4a3284c... labels
+      end
+    end
+
+  end
+end

data/app/views/common/_closing_modal.html.erb

@@ -1,3 +1,3 @@
-<p>
-  <%= l(:text_modal_is_closing) %>
+<p>
+  <%= l(:text_modal_is_closing) %>
 </p>

data/app/views/common/_collapsible_module_layout.html.erb

@@ -2,7 +2,7 @@
   <%= content_tag(:div, class: 'module-heading ' + renderer.heading_class, onclick: (renderer.collapsible? && 'EasyToggler.toggle(this.nextElementSibling, event)' || nil)) do %>
     <%= content_tag(:span, ' ', class: 'expander module-toggler') if renderer.collapsible? %>
     <%= content_tag(renderer.heading_tag, renderer.heading, class: renderer.icon) %>
-    <%= content_tag(:span, renderer.heading_links, class: 'module-heading-links') if renderer.heading_links %>
+    <%= content_tag(:span, renderer.heading_links, class: 'module-heading-links') if renderer.heading_links.presence %>
   <% end if renderer.heading.present? %>
   <div class="module-content" id="<%= renderer.id %>"<%=raw renderer.collapsed? && %q{ style="display:none"} || nil %>>
     <%= content -%>

data/app/views/common/close_modal.js.erb

@@ -1,5 +1,5 @@
-$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
-$("#ajax-modal").dialog('option', {
-  buttons: []
-});
+$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
+$("#ajax-modal").dialog('option', {
+  buttons: []
+});
 window.location = "<%= j params[:back_url] %>";

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/app/views/easy_settings/edit.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([redmine_extensions_engine, @easy_settings], html: { class: 'form-box easy-setting-plugin-form' }) do |f| %>
+<%= form_for(@easy_settings, html: { class: 'form-box easy-setting-plugin-form' }) do |f| %>
   <%= hidden_field_tag :back_url, params[:back_url] %>
 
   <%= render "easy_settings/#{@easy_settings.plugin.id}", easy_settings: @easy_settings, settings: @settings, form: f %>

data/config/database.yml

@@ -0,0 +1,15 @@
+---
+test:
+  adapter: 
+  database: test_redmine_8e3d204de2b24cab
+  host: 127.0.0.1
+  username: 
+  password: 
+  encoding: utf8
+development:
+  adapter: 
+  database: redmine_8e3d204de2b24cab
+  host: 127.0.0.1
+  username: 
+  password: 
+  encoding: utf8

data/config/routes.rb

@@ -1,7 +1,11 @@
+# Engine routes
 RedmineExtensions::Engine.routes.draw do
-
   resources :easy_settings, except: :destroy
-
 end
 
-RedmineExtensions::Engine.automount!
+# Redmine routes
+Rails.application.routes.draw do
+  mount RedmineExtensions::Engine => '/redmine_extensions'
+
+  resources :easy_settings, except: :destroy
+end

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

@@ -1,9 +1,9 @@
-<ul>
-<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
-  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
-<%% end %>
-<%% if @<%= model_name_underscored %>.nil? %>
-  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
-<%% end %>
-  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
+<ul>
+<%% if @<%= model_name_underscored %> && !@<%= model_name_underscored %>.new_record? %>
+  <li><%%= link_to l(:button_edit), edit_polymorphic_path([@project, @<%= model_name_underscored %>]), title: l(:button_edit), class: 'icon icon-edit' %></li>
+<%% end %>
+<%% if @<%= model_name_underscored %>.nil? %>
+  <li><%%= link_to l(:button_<%= model_name_underscored %>_new), new_polymorphic_path([@project, :<%= model_name_underscored %>]), title: l(:title_<%= model_name_underscored %>_new), class: 'icon icon-add button button-positive' %></li>
+<%% end %>
+  <li><%%= link_to l(:label_<%= model_name_pluralize_underscored %>), polymorphic_path([@project, :<%= model_name_pluralize_underscored %>], set_filter: '1'), title: l(:label_<%= model_name_pluralize_underscored %>), class: 'icon icon-folder button' %></li>
 </ul>

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

@@ -1,8 +1,8 @@
-<ul>
-<%% 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 %>
-  <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>
+<%% 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 %>
+  <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>

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

@@ -1,7 +1,7 @@
-class <%= model_name %>CustomField < CustomField
-
-  def type_name
-    :label_<%= @model_name_pluralize_underscored %>
-  end
-
-end
+class <%= model_name %>CustomField < CustomField
+
+  def type_name
+    :label_<%= @model_name_pluralize_underscored %>
+  end
+
+end

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

@@ -1,19 +1,19 @@
-<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
-
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
-  <%%= error_messages_for @<%= model_name_underscored %> %>
-
-  <div class="box">
-    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
-  </div>
-
-  <%% if !request.xhr? %>
-  <p>
-    <%%= submit_tag l(:button_update), title: l(:button_update) %>
-  </p>
-  <%% end %>
-<%% end %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= title l(:heading_<%= model_name_underscored %>_edit) %>
+
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
+  <%%= error_messages_for @<%= model_name_underscored %> %>
+
+  <div class="box">
+    <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
+  </div>
+
+  <%% if !request.xhr? %>
+  <p>
+    <%%= submit_tag l(:button_update), title: l(:button_update) %>
+  </p>
+  <%% end %>
+<%% end %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>

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) -%>",
-  click: function() {$(this).find('form').submit()},
-  'class': 'button-positive'
-}
-var closeButton = {
-  text: "<%=j l(:button_close) -%>",
-  title: "<%=j l(:button_close) -%>",
-  click: function() {$(this).dialog('close');},
-  'class': 'button'
-}
-$("#ajax-modal").dialog('option', {
-  buttons: [closeButton, submitButton]
+$("#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) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  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.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

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

@@ -1,5 +1,5 @@
-<%%= render @query %>
-<%% ### PAGE CUSTOMS ########################################################## %>
-<%% content_for :sidebar do %>
-  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
+<%%= render @query %>
+<%% ### PAGE CUSTOMS ########################################################## %>
+<%% content_for :sidebar do %>
+  <%%= render :partial => '<%= model_name_pluralize_underscored %>/sidebar' %>
 <%% end %>