redmine_extensions 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5bdd71d9b581303878b289c07e4fa88fec0f319ee9c94b310db8ffe9bcf71a
-  data.tar.gz: 5c8d77bc0b82467bbb10a2429a984efdeece83f62372ce83f39c51f5977a7f89
+  metadata.gz: e01494fb8634b6116c7ee6df38c54a79845aed25438558c1bd068a24bc551d60
+  data.tar.gz: 3018303ecf9d11f4b9ed3720729cb7bcf0eef94adbdfebbc83fba0959a648698
 SHA512:
-  metadata.gz: 4a46dc0c10ebbd8e95257516d22e49d4bef13c02fbc2564ad000dfc48f67e960c66ac9a5e4bc2e141bf4697ee3d33eae8a6abf127cd3fa56c1e99ce64a5354f2
-  data.tar.gz: 20a9d5f7e2bc0dabf8465297965b5497bbd5f06b6c3991405ee5d5d66eaab09cb1d110f60ae37a7346bcbe5b6afd1aca70595aeb177d998c342afe40c60a8851
+  metadata.gz: 10c0ece096eeeaa651feeae6aafa0004270bd7a87ff15f4e4f8118e596f0dae6c17c0cbd0841a132c079cdc8e49bbcd5f509a0d0adf6bb528692806354c3a7c0
+  data.tar.gz: 0c77dcfcafb5d125ab9cdb22fc7b134665cf4afa45373bcfc39ea1e6c42c3050dda90061be766f8d45a15a1cabd9d196ef85a1ce3089da9e74299342120151ee

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

@@ -80,6 +80,7 @@ module RedmineExtensions
       template 'index.api.rsb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.api.rsb"
       template 'index.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.html.erb"
       template 'index.js.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/index.js.erb"
+      template '_list.html.erb.erb', "#{plugin_path}/app/views/#{model_name_pluralize_underscored}/_list.html.erb"
 
       if mail?
         template 'mailer.rb.erb', "#{plugin_path}/app/models/#{model_name_underscored}_mailer.rb"

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

@@ -0,0 +1,69 @@
+<%%= form_tag({}, :data => {:cm_url => context_menu_<%= model_name_pluralize_underscored %>_path}) do -%>
+  <%%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
+  <div class="autoscroll">
+    <table class="list odd-even entities">
+      <thead>
+        <tr>
+          <th class="checkbox hide-when-print">
+            <%%= check_box_tag 'check_all', '', false, class: 'toggle-selection',
+            title: "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+          </th>
+          <%% @query.inline_columns.each do |column| %>
+            <%%= column_header(@query, column) %>
+          <%% end %>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%% grouped_query_results(entities, @query) do |entity, group_name, group_count, group_totals| -%>
+        <%% if group_name %>
+          <%% reset_cycle %>
+          <tr class="group open">
+            <td colspan="<%%= @query.inline_columns.size + 2 %>">
+              <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+              <span class="name"><%%= group_name %></span>
+              <%% if group_count %>
+              <span class="count"><%%= group_count %></span>
+              <%% end %>
+              <span class="totals"><%%= group_totals %></span>
+              <%%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
+              "toggleAllRowGroups(this)", class: 'toggle-all') %>
+            </td>
+          </tr>
+        <%% end %>
+        <tr id="entity_id_<%%= entity.id %>" class="entity <%%= cycle('odd', 'even') %> hascontextmenu">
+          <td class="checkbox hide-when-print"><%%= check_box_tag("ids[]", entity.id, false, id: nil) %></td>
+          <%% @query.inline_columns.each do |column| %>
+            <%%= content_tag('td', column_content(column, entity), class: column.css_classes) %>
+          <%% end %>
+          <td class="buttons">
+            <%% if entity.editable_by?(User.current) -%>
+            <%%= link_to l(:button_edit), edit_<%= model_name_underscored %>_path(entity),
+            title: l(:button_edit),
+            class: 'icon-only icon-edit' %>
+            <%%= link_to l(:button_delete), <%= model_name_underscored %>_path(entity),
+            data: {confirm: l(:text_are_you_sure)},
+            method: :delete,
+            title: l(:button_delete),
+            class: 'icon-only icon-del' %>
+            <%% end -%>
+          </td>
+        </tr>
+        <%% @query.block_columns.each do |column|
+        if (text = column_content(column, entity)) && text.present? -%>
+          <tr class="<%%= current_cycle %>">
+            <td colspan="<%%= @query.inline_columns.size + 1 %>" class="<%%= column.css_classes %>">
+              <%% if query.block_columns.count > 1 %>
+              <span><%%= column.caption %></span>
+              <%% end %>
+              <%%= text %>
+            </td>
+          </tr>
+          <%% end -%>
+        <%% end -%>
+        <%% end -%>
+      </tbody>
+    </table>
+  </div>
+  <%% end -%>
+<%%= context_menu %>

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

@@ -23,6 +23,9 @@ class <%= controller_class %>Controller < ApplicationController
     index_for_easy_query(<%= model_name %>Query)
     <% else %>
     retrieve_query(<%= model_name %>Query)
+    @entity_count = @query.<%= model_name_pluralize_underscored %>.count
+    @entity_pages = Paginator.new @entity_count, per_page_option, params['page']
+    @entities = @query.<%= model_name_pluralize_underscored %>(offset: @entity_pages.offset, limit: @entity_pages.per_page)
     <% end %>
   end
 
@@ -48,7 +51,7 @@ class <%= controller_class %>Controller < ApplicationController
   end
 
   def create
-    @<%= model_name_underscored %> = <%= model_name %>.new<%= "author: User.current" if author? %>
+    @<%= model_name_underscored %> = <%= model_name %>.new <%= "author: User.current" if author? %>
     <%- if project? -%>
     @<%= model_name_underscored %>.project = @project
     <%- end -%>

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

@@ -13,26 +13,18 @@
   <%% end %>
 </div>
 <h2><%%= @query.queried_class.to_s %></h2>
-<div id="query_form_with_buttons" class="hide-when-print">
-  <div id="query_form_content">
-    <table class="list issues">
-      <thead>
-        <%% @query.available_columns.each do |column| %>
-          <th>
-            <%%= column.caption %>
-          </th>
-        <%% end %>
-      </thead>
-      <tbody>
-        <%% @query.<%= model_name_pluralize_underscored %>.each do |entity| %>
-          <tr>
-            <%% @query.available_columns.each do |column| %>
-              <%%= content_tag('td', column_content(column, entity)) %>
-            <%% end %>
-          </tr>
-        <%% end %>
-      </tbody>
-    </table>
-  </div>
-</div>
+
+<%%= form_tag(<%= model_name_pluralize_underscored %>_path, method: :get, id: 'query_form') do %>
+  <%%= render partial: 'queries/query_form' %>
+<%% end %>
+
+<%% if @query.valid? %>
+  <%% if @entities.empty? %>
+    <p class="nodata"><%%= l(:label_no_data) %></p>
+  <%% else %>
+    <%%= render_query_totals(@query) %>
+    <%%= render partial: 'list', locals: { entities: @entities }%>
+    <span class="pagination"><%%= pagination_links_full @entity_pages, @entity_count %></span>
+  <%% end %>
+<%% end %>
 <% end %>

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

@@ -36,7 +36,6 @@ class <%= model_name %> < ActiveRecord::Base
   <%= 'validates :project_id, presence: true' if project? %>
   <%= 'validates :author_id, presence: true' if author? %>
 
-  attr_protected :id
 
   <%- if associations.any? -%>
   <%- associations.each do |assoc_name, values| -%>
@@ -71,6 +70,10 @@ class <%= model_name %> < ActiveRecord::Base
     'icon icon-user'
   end
 
+  def editable_by?(user)
+    visible?(user)
+  end
+
   <%- if !project? -%>
   def project
     nil

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

@@ -24,7 +24,7 @@ class <%= model_name %>Query < Query
     group = l("label_filter_group_#{self.class.name.underscore}")
 
     <%- db_columns.each do |column_name, column_options| -%>
-    @available_columns << QueryColumn.new('<%= column_options[:query_column_name] || column_name %>', caption: <%= model_name %>.human_attribute_name(:<%= column_name %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>), group: group)
+    @available_columns << QueryColumn.new(:<%= column_options[:query_column_name] || column_name %>, caption: <%= model_name %>.human_attribute_name(:<%= column_name %>), title: <%= model_name %>.human_attribute_name(:<%= column_name %>), group: group)
       <%- end -%>
     <%- if acts_as_customizable? -%>
     @available_columns += <%= model_name %>CustomField.visible.collect { |cf| QueryCustomFieldColumn.new(cf) }
@@ -33,6 +33,11 @@ class <%= model_name %>Query < Query
     @available_columns
   end
 
+  def initialize(attributes=nil, *args)
+    super attributes
+    self.filters ||= { "<%= db_columns.first[0] %>" => {:operator => "*", :values => []} }
+  end
+
   def default_columns_names
     super.presence || <%= db_columns.collect{|column_name, column_options| (column_options[:query_column_name] || column_name).to_s}[0..3].to_s %>.flat_map{|c| [c.to_s, c.to_sym]}
   end

data/lib/redmine_extensions/engine.rb

@@ -18,11 +18,14 @@ module RedmineExtensions
 
     config.autoload_paths << config.root.join('lib')
     config.eager_load_paths << config.root.join('app', 'models', 'easy_queries')
-    config.assets.precompile << 'redmine_extensions/applications.js'
-    config.assets.precompile << 'redmine_extensions/blocking.js'
-    unless Rails.env.production?
-      config.assets.precompile << 'redmine_extensions/jasmine_lib/jasmine_lib.js'
-      config.assets.precompile << 'redmine_extensions/jasmine.css'
+
+    initializer 'redmine_extensions.assets' do
+      config.assets.precompile << 'redmine_extensions/applications.js'
+      config.assets.precompile << 'redmine_extensions/blocking.js'
+      unless Rails.env.production?
+        config.assets.precompile << 'redmine_extensions/jasmine_lib/jasmine_lib.js'
+        config.assets.precompile << 'redmine_extensions/jasmine.css'
+      end
     end
 
     #config.to_prepare goes after Reloader.to_prepare

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,6 +97,7 @@ files:
 - lib/generators/redmine_extensions/entity/entity_generator.rb
 - lib/generators/redmine_extensions/entity/templates/_%model_name_underscored%.api.rsb.tt
 - lib/generators/redmine_extensions/entity/templates/_form.html.erb.erb
+- lib/generators/redmine_extensions/entity/templates/_list.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/_sidebar.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/context_menu.html.erb.erb
 - lib/generators/redmine_extensions/entity/templates/controller.rb.erb