redmine_extensions 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf428f184580b1d84aa970ae3db9319a468c808
-  data.tar.gz: bd001b0f6ac3a274b77734c7a4e7fa476bdb6840
+  metadata.gz: eee22e1f0eeb964e748a80f0610126541f431768
+  data.tar.gz: 6d824882250e9379351fae51a6fb68ea4d62924c
 SHA512:
-  metadata.gz: 23d1c6ae87326b37fc1c21ce99cc63af709c8c3d568a6f29889e46a17db33ea3d2836b3fd8aad754d65c0c4ad809eaf8ec82c1e8869afae9fc3e31dc9cb95195
-  data.tar.gz: 30214f00044665230086c685d6217e0b1d57bfe9230e08da2fc2fe62a2f11c39af181b7bdcb9f69c8f26e0b5588acdf99e0f0525ace2ee947c328ed965ca2753
+  metadata.gz: fc4adc022915545c8432e4867827169ba72e0d0af19eac89c2e0961fdd7843b461c241b6139791a91c3bb24e8280a9cb2109fee45219b794509f490b677b9db4
+  data.tar.gz: 938ab6557a3b51aee80e345aaad6c37237bb1cae9b725280763e4f2ca38e6fc72ab85e1db651a40ee1e2bd7fb79ec70fc91fae49cd5132af54d49c73a35db9c9

data/app/helpers/redmine_extensions/application_helper.rb

@@ -124,6 +124,25 @@ module RedmineExtensions
     end
 
 
+    def easy_avatar_url(user = nil)
+      user ||= User.current
+      result = if Setting.gravatar_enabled?
+        options = {:ssl => (request && request.ssl?), :default => Setting.gravatar_default}
+        email = nil
+        if user.respond_to?(:mail)
+          email = user.mail
+        elsif user.to_s =~ %r{<(.+?)>}
+          email = $1
+        end
+        email ? gravatar_url(email, options) : ''
+      elsif user.easy_avatar_url.present?
+        user.easy_avatar_url
+      elsif user.respond_to?(:easy_avatar) && (av = user.easy_avatar).present? && (img_url = av.image.url(:small))
+        get_easy_absolute_uri_for(img_url).to_s
+      end
+      result
+    end
+
     # ==== Options
     # * <tt>class: Hash or String</tt> - This option can be used to add custom CSS classes. It can be *String* or *Hash*.
     #       class: {heading: 'heading-additional-css', container: 'container-additional-css'}

data/app/models/easy_setting.rb

@@ -172,7 +172,7 @@ class EasySetting < ActiveRecord::Base
       EasySetting.where(name: key, project_id: project_id).limit(1).pluck(:value).first
     end
 
-    if use_fallback && result.blank?
+    if use_fallback && result.nil?
       result = Rails.cache.fetch(fallback_cache_key) do
         EasySetting.where(name: key, project_id: nil).limit(1).pluck(:value).first
       end

data/app/views/easy_front_end/_easy_front_end.html.erb

@@ -0,0 +1,92 @@
+<% content_for :header_tags do %>
+  <%=
+    if params['combine_by_pipeline'].nil?
+      if Rails.env.development? && ENV['DART'] == '1'
+        javascript_include_tag('dart/localhost', plugin: plugin)
+      else
+        javascript_include_tag("#{plugin}.dart", defer: true)
+      end
+    else
+      if params['combine_by_pipeline'] == 'false'
+        #javascript_include_tag('dart/debug', plugin: plugin, defer: true)
+        if ENV['DART'] == '1'
+          javascript_include_tag('dart/localhost', plugin: plugin)
+        end
+      else
+        javascript_include_tag("#{plugin}.dart", defer: true)
+      end
+    end
+  %>
+
+  <%
+    standard_lang_files = [
+        :notice_successful_create,
+        :notice_successful_update,
+        :notice_successful_delete,
+        :error_default_server_error,
+        :notice_not_implemented,
+        :notice_service_unavailable,
+        :notice_not_authorized,
+        :notice_not_acceptable,
+        :label_updated_on,
+
+        :field_created_on,
+        :field_updated_on,
+        :field_tracker,
+        :field_description,
+        :field_assigned_to,
+        :field_status,
+        :field_fixed_version,
+        :field_done_ratio,
+        :field_start_date,
+        :field_due_date,
+        :field_estimated_hours,
+        :field_homepage,
+        :field_author,
+        :field_spent_hours,
+        :field_priority,
+        :field_activity,
+        :field_category,
+
+        :button_save,
+        :button_delete,
+        :button_submit,
+        :label_expand_editor,
+        :label_collapse_editor,
+        :text_are_you_sure,
+        :general_text_Yes,
+        :general_text_No,
+        :button_cancel,
+        :button_print,
+        :button_edit,
+        :button_close,
+        :label_favorite,
+        :label_unfavorite,
+        :button_fullscreen,
+        :label_no_entity_selected,
+        :date
+    ]
+
+    user = User.current
+
+    front_end_commons = {
+        global_settings: {
+            locale: I18n.locale,
+            date_format: Setting.date_format,
+            html5_dates: EasySetting.value('html5_dates'),
+            ckeditor_toolbar_config: EasySetting.value('ckeditor_toolbar_config') || 'Basic',
+            show_issue_id: EasySetting.value('show_issue_id')
+        },
+        user: {
+            id: User.current.id,
+            name: User.current.name,
+            avatar_url: easy_avatar_url(user)
+        },
+        standard_lang_files: Hash[*standard_lang_files.collect { |v| [v, l(v)] }.flatten]
+    }
+
+  %>
+  <script>
+    window.frontEndCommons = "<%= escape_javascript(front_end_commons.to_json.html_safe) %>";
+  </script>
+<% end %>

data/app/views/easy_front_end/_interop_lookup_cf.erb

@@ -0,0 +1,37 @@
+<script>
+  function interopAdapterForLookupCustomFieldDialog(url, closeButtonLabel, submitButtonLabel, fieldId, selectedValues, onClose) {
+    $.post(url, {'selected_values': selectedValues}, function (data) {
+      var ajaxModal = $("#ajax-modal");
+      if ($('#easy_modal').length === 0) {
+        ajaxModal.parent().append($("<div/>").attr({id: "easy_modal"}).hide());
+      }
+      var modal = $('#easy_modal');
+      modal.html(data);
+
+      EASY.modalSelector.showEasyModal(function () {
+        return [url + '&' + $('#modal_selector_query_form, .modal-selected-values form').serialize() + '&page=', ''];
+      });
+
+      var btns = [];
+
+      btns.push({
+        text: closeButtonLabel,
+        click: function () {
+          $(this).dialog('close');
+        },
+        'class': 'button'
+      });
+
+      btns.push({
+        text: submitButtonLabel,
+        click: function () {
+          EASY.modalSelector.saveAndCloseModal(fieldId);
+          onClose();
+        },
+        'class': 'button-positive'
+      });
+
+      modal.dialog({title: $("#" + fieldId + "_lookup_trigger_container").prev("label").text(), buttons: btns});
+    });
+  }
+</script>

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/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/mail_added.html.erb.erb

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

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

@@ -1,13 +1,13 @@
-<% if project? %>
-resources :projects do
-  resources :<%= model_name_pluralize_underscored %>
-end
-<% end %>
-resources :<%= model_name_pluralize_underscored %> do
-  collection do
-    get 'autocomplete'
-    get 'bulk_edit'
-    post 'bulk_update'
-    get 'context_menu'
-  end
+<% if project? %>
+resources :projects do
+  resources :<%= model_name_pluralize_underscored %>
+end
+<% end %>
+resources :<%= model_name_pluralize_underscored %> do
+  collection do
+    get 'autocomplete'
+    get 'bulk_edit'
+    post 'bulk_update'
+    get 'context_menu'
+  end
 end

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,6 +167,8 @@ files:
 - app/views/common/close_modal.js.erb
 - app/views/easy_entity_assignments/_assignments_container.html.erb
 - app/views/easy_entity_assignments/_query_index.html.erb
+- app/views/easy_front_end/_easy_front_end.html.erb
+- app/views/easy_front_end/_interop_lookup_cf.erb
 - app/views/easy_queries/_easy_query_list.html.erb
 - app/views/easy_queries/_easy_query_tiles.html.erb
 - app/views/easy_queries/_entities.html.erb
@@ -293,22 +295,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Redmine Extensions is set of usefull features for Redmine. Main focus is
   on development helpers, but many users can find it helpfull
 test_files:
-- spec/rails_helper.rb
-- spec/factories/time_entries.rb
+- spec/factories/easy_queries.rb
 - spec/factories/easy_settings.rb
 - spec/factories/issues.rb
 - spec/factories/projects.rb
+- spec/factories/time_entries.rb
 - spec/factories/trackers.rb
-- spec/factories/easy_queries.rb
 - spec/factories/users.rb
+- spec/features/autocomplete_spec.rb
+- spec/models/easy_setting_spec.rb
 - spec/presenters/redmine_extensions/easy_setting_presenter_spec.rb
-- spec/support/plugin_generator.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/models/easy_setting_spec.rb
-- spec/features/autocomplete_spec.rb
+- spec/support/plugin_generator.rb