redmine_extensions 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ac333edb2cc8180083916b31b0427f4d21b24f
-  data.tar.gz: 9229dd36b4d816a8e3ee17429b4f66a6a0c9b12f
+  metadata.gz: 522809041f3581f46743acc33b566970816ef331
+  data.tar.gz: 2f5bc4832ae3a5137d7baa8181b23104166265a6
 SHA512:
-  metadata.gz: 5c46f1ee46fcaa2746e96fb2bc8cfb38f9fbb9d6f7596d41365bb2e192f49b81cf1c1f0c672f15a2ef4f9f7b13f5ab8fc4e810662e531234f84a576cda311885
-  data.tar.gz: e5c2521b4c39108aa090369cf1af674f59642e9a49d1f9cf411c173d798f45751a5f2cb26fbf9771720e81a427e3f6cf309a671bc1e8d0dc8d830856fb2232cc
+  metadata.gz: dbea58638eefc30064982eaca6c6608fd0142c74cd3d864921c6dd5ca8c3cdcdf12d9e525516b00531dec69990dd6e9631286e1431c70a258ba7960d56c217b5
+  data.tar.gz: 45ff9282544268cfa20c6f7e55546475d9ea300c3b1b41214ba7bf21b0ed955d7f8a1bd4506811d74c4b5fde1d998da92c539a991821fb0118586c482572871c

data/app/views/easy_settings/edit.html.erb

@@ -1,5 +1,5 @@
 <%= form_for([redmine_extensions_engine, @easy_settings]) do |f| %>
   <%= render "easy_settings/#{@easy_settings.plugin.id}", easy_settings: @easy_settings, settings: @settings, form: f %>
 
-  <%= f.submit class: 'button-2' %>
+  <%= f.submit l(:button_update_easy_settings), class: 'button-2' %>
 <% end %>

data/config/locales/cs.yml

@@ -1,2 +1,3 @@
 cs:
   nothing: Nothing
+  button_update_easy_settings: Upravit nastavení

data/config/locales/en.yml

@@ -1,2 +1,3 @@
 en:
-  nothing: Nothing
+  nothing: Nothing
+  button_update_easy_settings: Update settings

data/lib/generators/redmine_extensions/entity/entity_generator.rb

@@ -48,7 +48,10 @@ module RedmineExtensions
 
       if File.exists?("#{plugin_path}/config/locales/en.yml")
         append_to_file "#{plugin_path}/config/locales/en.yml" do
-          "\n  heading_#{model_name_underscored}_new: New #{model_name_underscored.titleize}" +
+          "\n  easy_query:" +
+            "\n    name:" +
+            "\n      #{model_name_underscored}_query: #{model_name_pluralize_underscored.titleize}" +
+            "\n  heading_#{model_name_underscored}_new: New #{model_name_underscored.titleize}" +
             "\n  heading_#{model_name_underscored}_edit: Edit #{model_name_underscored.titleize}" +
             "\n  button_#{model_name_underscored}_new: New #{model_name_underscored.titleize}" +
             "\n  label_#{model_name_pluralize_underscored}: #{@model_name_pluralize_underscored.titleize}" +
@@ -104,7 +107,7 @@ module RedmineExtensions
       end
 
       if File.exists?("#{plugin_path}/init.rb")
-        s = "\nActiveSupport.on_load(:active_record) do"
+        s = "\nActiveSupport.on_load(:easyproject, yield: true) do"
         s << "\n  require '#{plugin_name_underscored}/#{model_name_underscored}_hooks'\n"
         s << "\n  Redmine::AccessControl.map do |map|"
         s << "\n    map.project_module :#{model_name_pluralize_underscored} do |pmap|"

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

@@ -14,7 +14,7 @@
     <%- if column_options[:query_type] == 'string' || column_options[:query_type] == 'integer' -%>
     <%%= f.text_field :<%= column_name %> %>
     <%- elsif column_options[:query_type] == 'list' || column_options[:query_type] == 'list_optional' -%>
-    <%%= f.select :<%= column_name %>, <%= column_options[:class] %>.all.collect{|x| [x.<%= column_options[:list_class_name] %>, x.id]}, include_blank: true %>
+    <%%= f.select :<%= column_name %>, <%= column_options[:class] %>.all.collect{|x| [x.<%= column_options[:list_class_name] %>, x.id]}.sort, include_blank: true %>
     <%- elsif column_options[:query_type] == 'text' -%>
     <%%= f.text_area :<%= column_name %>, :cols => 60, :rows => (<%= model_name_underscored %>.<%= column_name %>.blank? ? 10 : [[10, <%= model_name_underscored %>.<%= column_name %>.length / 50].max, 100].min), :accesskey => accesskey(:edit), :class => 'wiki-edit' %>
     <%%= wikitoolbar_for '<%= model_name_underscored %>_<%= column_name %>' %>

data/lib/generators/redmine_extensions/entity/templates/en.yml.erb

@@ -1,4 +1,7 @@
 en:
+  easy_query:
+    name:
+      <%= model_name_underscored %>_query: <%= model_name_pluralize_underscored.titleize %>
   heading_<%= model_name_underscored %>_new: New <%= model_name_underscored.titleize %>
   heading_<%= model_name_underscored %>_edit: Edit <%= model_name_underscored.titleize %>
   button_<%= model_name_underscored %>_new: New <%= model_name_underscored.titleize %>

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

@@ -2,10 +2,6 @@ class <%= model_name %>Query < EasyQuery
 
   self.queried_class = <%= model_name %>
 
-  def entity
-    <%= model_name %>
-  end
-
   def initialize_available_filters
     <%- db_columns.each do |column_name, column_options| -%>
     <%- if project? && column_name == 'project_id' -%>
@@ -25,7 +21,7 @@ class <%= model_name %>Query < EasyQuery
     return @available_columns if @available_columns
 
     <%- db_columns.each do |column_name, column_options| -%>
-    add_available_column '<%= column_options[:query_column_name] || column_name %>', caption: <%= model_name %>.human_attribute_name(:<%= column_name %>)
+    add_available_column '<%= column_options[:query_column_name] || column_name %>', title: <%= model_name %>.human_attribute_name(:<%= column_name %>)
       <%- end -%>
     <%- if acts_as_customizable? -%>
     @available_columns += <%= model_name %>CustomField.visible.collect {|cf| QueryCustomFieldColumn.new(cf) }

data/lib/generators/redmine_extensions/plugin/plugin_generator.rb

@@ -29,10 +29,10 @@ module RedmineExtensions
       empty_directory "#{plugin_path}/config/locales"
       empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}"
 
-      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/controllers"
-      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/helpers"
-      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/models"
-      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/others"
+      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/controllers"
+      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/helpers"
+      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/models"
+      empty_directory "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/others"
 
       template 'gitkeep.erb', "#{plugin_path}/app/controllers/.gitkeep"
       template 'gitkeep.erb', "#{plugin_path}/app/helpers/.gitkeep"
@@ -41,7 +41,7 @@ module RedmineExtensions
       template 'gitkeep.erb', "#{plugin_path}/db/migrate/.gitkeep"
       template 'gitkeep.erb', "#{plugin_path}/assets/images/.gitkeep"
       template 'gitkeep.erb', "#{plugin_path}/assets/javascripts/.gitkeep"
-      template 'gitkeep.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/others/.gitkeep"
+      template 'gitkeep.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/others/.gitkeep"
 
       template 'Gemfile.erb', "#{plugin_path}/Gemfile"
       template 'init.rb.erb', "#{plugin_path}/init.rb"
@@ -49,9 +49,9 @@ module RedmineExtensions
       template 'routes.rb.erb', "#{plugin_path}/config/routes.rb"
       template 'hooks.rb.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/hooks.rb"
       template 'internals.rb.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/internals.rb"
-      template 'issue_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/models/issue_patch.example"
-      template 'issues_controller_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/controllers/issues_controller_patch.example"
-      template 'issues_helper_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/redmine_patch/helpers/issues_helper_patch.example"
+      template 'issue_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/models/issue_patch.example"
+      template 'issues_controller_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/controllers/issues_controller_patch.example"
+      template 'issues_helper_patch.example.erb', "#{plugin_path}/lib/#{plugin_name_underscored}/easy_patch/redmine/helpers/issues_helper_patch.example"
     end
 
     hook_for :entity, as: :entity, in: :redmine_extensions, type: :boolean

data/lib/generators/redmine_extensions/plugin/templates/Gemfile.erb

@@ -1 +1 @@
-gem 'redmine_extensions', '~> 0.0.12'
+gem 'redmine_extensions', '~> 0.0.21'

data/lib/generators/redmine_extensions/plugin/templates/init.rb.erb

@@ -3,14 +3,14 @@ Redmine::Plugin.register :<%= plugin_name_underscored %> do
   author ''
   author_url ''
   description ''
-  version '<%= Date.today.strftime('%Y.01.01') %>'
+  version '<%= Date.today.strftime('%Y') %>'
 
   #into easy_settings goes available setting as a symbol key, default value as a value
   settings easy_settings: {  }
 end
 
 
-Dir[File.dirname(__FILE__) + '/lib/<%= plugin_name_underscored %>/redmine_patch/*/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/lib/<%= plugin_name_underscored %>/easy_patch/**/*.rb'].each {|file| require_dependency file }
 
 # this block is executed once just after Redmine is started
 # means after all plugins are initialized

data/lib/redmine_extensions/engine.rb

@@ -9,6 +9,7 @@ module RedmineExtensions
       path ||= engine.to_s.underscore.split('/').first
       Rails.application.routes.draw do
         mount engine => path
+        resources :easy_settings, only: [:edit]
       end
     end
 
@@ -44,7 +45,9 @@ module RedmineExtensions
         js_dir = app.root.join('public', 'javascripts', 'redmine_extensions')
         FileUtils.mkdir(js_dir) unless File.directory?(js_dir)
         Dir.glob( root.join('app', 'assets', 'javascripts', 'redmine_extensions', '*.js') ) do |js_file|
-          FileUtils.cp(js_file, app.root.join('public', 'javascripts', 'redmine_extensions'))
+          begin
+            FileUtils.cp(js_file, app.root.join('public', 'javascripts', 'redmine_extensions'))
+          end
         end
       end
     end

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

@@ -6,6 +6,7 @@ module RedmineExtensions
       base.send(:include, InstanceMethods)
 
       base.class_eval do
+        helper_method :easy_extensions?
       end
     end
 

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails