#218352,Réduire le temps de chargement de la page de visualisation d'une demande

.github/workflows/4_1_6.yml → .github/workflows/4_1_7.yml

@@ -1,8 +1,8 @@
-name: Tests 4.1.6
+name: Tests 4.1.7
 
 env:
   PLUGIN_NAME: redmine_tiny_features
-  REDMINE_VERSION: 4.1.6
+  REDMINE_VERSION: 4.1.7
   RAILS_ENV: test
 
 on:
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -72,15 +72,16 @@ jobs:
           sudo mv policy.xml /etc/ImageMagick-6/policy.xml
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Setup Bundler
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
@@ -113,19 +114,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

.github/workflows/4_2_4.yml → .github/workflows/4_2_9.yml

@@ -1,8 +1,8 @@
-name: Tests 4.2.4
+name: Tests 4.2.9
 
 env:
   PLUGIN_NAME: redmine_tiny_features
-  REDMINE_VERSION: 4.2.4
+  REDMINE_VERSION: 4.2.9
   RAILS_ENV: test
 
 on:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6']
+        ruby: ['2.7']
         db: ['postgres']
       fail-fast: false
 
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -72,22 +72,24 @@ jobs:
           sudo mv policy.xml /etc/ImageMagick-6/policy.xml
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Setup Bundler
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
 
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
+          sed -i -e 's/.*puma.*/  gem "puma", "< 6"/' Gemfile
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml
@@ -113,19 +115,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

.github/workflows/master.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -72,15 +72,16 @@ jobs:
           sudo mv policy.xml /etc/ImageMagick-6/policy.xml
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Setup Bundler
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
@@ -113,19 +114,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

README.md

@@ -8,20 +8,27 @@ Here is a complete list of the features:
 * Hide optional advanced fields in **version** form
 * Define a **default project** selected when creating a new issue without being in a specific project
 * Add **check-all / uncheck-all shortcuts** to roles filters
-* Improve **roles synthesis** by adding missing informations about issues permissions and trackers
-* Improve load time of **users filters** when there are thousands entries
+* Improve **roles synthesis** by adding missing data about issues permissions and trackers
+* Use or not the select2 plugin
+* Improve load time of **users filters** when there are thousands entries and when the select2 plugin is used
 * Save **note deletion** in issue journal
 * Fix **pasted images** when using Chrome (may be fixed in future Redmine versions according to this issue https://www.redmine.org/issues/36013)
+* **Reminders rake task: add max-delay option** to define the maximum number of days after which reminders stop to be sent
+* Add **range** custom-field format
+* Apply **default value** to existing-issues custom-fields if field is required and not set
+* Add **enabled modules** filter and column in projects list
+* Add **prevent issue copy** attribute to trackers
+* Add new permission to always see **users's email addresses**, bypassing user email_hiding setting
 
 ## Test status
 
 |Plugin branch| Redmine Version   | Test Status      |
 |-------------|-------------------|------------------|
-|master       | 4.2.4             | [![4.2.4][1]][5] | 
-|master       | 4.1.6             | [![4.1.6][2]][5] | 
+|master       | 4.2.9             | [![4.2.9][1]][5] | 
+|master       | 4.1.7             | [![4.1.7][2]][5] | 
 |master       | master            | [![master][3]][5]|
 
-[1]: https://github.com/nanego/redmine_tiny_features/actions/workflows/4_2_4.yml/badge.svg
-[2]: https://github.com/nanego/redmine_tiny_features/actions/workflows/4_1_6.yml/badge.svg
+[1]: https://github.com/nanego/redmine_tiny_features/actions/workflows/4_2_9.yml/badge.svg
+[2]: https://github.com/nanego/redmine_tiny_features/actions/workflows/4_1_7.yml/badge.svg
 [3]: https://github.com/nanego/redmine_tiny_features/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/nanego/redmine_tiny_features/actions

app/overrides/context_menus/issues.rb

@@ -0,0 +1,6 @@
+Deface::Override.new :virtual_path => 'context_menus/issues',
+                     :name => 'hide-copy-issue-if-tracker-prevents-it',
+                     :insert_bottom => 'erb[loud]:contains("context_menu_link l(:button_copy), project_copy_issue_path(@project, @issue)")',
+                     :text => <<-HIDE_LINK
+    if !@issue.tracker.prevent_issue_copy
+HIDE_LINK

app/overrides/issues/_action_menu.rb

@@ -0,0 +1,47 @@
+Deface::Override.new :virtual_path => 'issues/_action_menu',
+                     :name => 'hide-copy-issue-if-tracker-prevents-it',
+                     :insert_bottom => 'erb[loud]:contains("link_to l(:button_copy)")',
+                     :text => <<-HIDE_LINK
+  && !@issue.tracker.prevent_issue_copy
+HIDE_LINK
+Deface::Override.new :virtual_path  => 'issues/_action_menu',
+                       :name        => 'call-renderPartialEdit-before-showAndScrollTo',
+                       :replace     => "erb[loud]:contains('l(:button_edit)')",
+                       :text        => <<-REPLACE_BUTTON
+
+<% # Put the condition here, not at the beginning of the file, so that we can check the configuration each time we download the page,
+  # if we put the condition at the beginning of the file it does not execute only once, (start application) %>
+<% if Setting.plugin_redmine_tiny_features.key?('do_not_preload_issue_edit_form') %>
+  <%= link_to l(:button_edit), edit_issue_path(@issue),
+  :onclick => 'renderPartialEdit(); return false;',
+  :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
+  <script>
+    var isloaded = false;
+    function renderPartialEdit(id){
+      if (!isloaded) {
+        $.ajax({
+          url: "<%= render_form_by_ajax_path(@issue.id) %>",
+          success: function(response) {
+            $('#update').append(response.html);
+            showAndScrollTo("update", "issue_notes");
+            isloaded = true;
+            $( document ).ready(function() {
+              // for datepicker element, 
+              <% include_calendar_headers_tags %>
+              // for wikitoolbar element in mode Textile,
+              setupFileDrop();
+              // But for mode visual there is no need to call because it is already called in { $(document).ajaxSuccess/redmine_wysiwyg_editor }
+            });
+          },error: function(response) {
+            console.error(response);
+          },
+        });
+      }
+    } 
+  </script>
+<% else %>
+  <%= link_to l(:button_edit), edit_issue_path(@issue),
+            :onclick => 'showAndScrollTo("update", "issue_notes"); return false;',
+            :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
+<% end %>
+REPLACE_BUTTON

app/overrides/issues/_action_menu_edit.rb

@@ -0,0 +1,8 @@
+Deface::Override.new :virtual_path  => 'issues/_action_menu_edit',
+                       :name        => 'prevents-render-edit-partial-render-it-only-on-edit-button-click',
+                       :replace     => "erb[loud]:contains(\"render :partial => 'edit'\")",
+                       :text        => <<-RENDER_PARTIAL
+<% if !Setting.plugin_redmine_tiny_features.key?('do_not_preload_issue_edit_form') %>
+  <%= render :partial => 'edit' %>
+<% end %>
+RENDER_PARTIAL

app/overrides/queries/_filters.rb

@@ -3,11 +3,17 @@
                      :insert_after => "div.add-filter",
                      :text       => <<SELECT2
 <script>
+  // declaration this functions here, in order to generate the path by rails
+
+  function useRedminePluginSelect2(){
+    return <%= Setting.plugin_redmine_tiny_features.key?('use_select2') %>
+  }
 
-  // declaration this function here, in order to generate the path by rails
   function updateSelect2ForElements() {
-    var activePagination = '<%= Setting["plugin_redmine_tiny_features"]["paginate_issue_filters_values"].present?%>';
-    if (activePagination === 'true'){
+    var activeSelect2 = useRedminePluginSelect2()
+    var activePagination = '<%= Setting["plugin_redmine_tiny_features"]["paginate_issue_filters_values"].present? %>';
+
+    if (activeSelect2 && activePagination === 'true'){
       // check if values_author_id_1 defined
       if ($('#values_author_id_1').length > 0) {
         setConfigurationForSelect2($('#values_author_id_1'), '<%= author_values_pagination_path %>');
@@ -27,6 +33,5 @@
       }
     }
   }
-
 </script>
 SELECT2

app/overrides/trackers/_form.rb

@@ -0,0 +1,7 @@
+Deface::Override.new :virtual_path => "trackers/_form",
+                     :name => "add-prevent-copy-issues",
+                     :insert_after => "p:eq(2)",
+                     :text => <<-EOS
+<p><%= f.check_box :prevent_issue_copy %></p>
+EOS
+

app/overrides/users/_preferences.rb

@@ -0,0 +1,8 @@
+Deface::Override.new :virtual_path  => "users/_preferences",
+                    :name         	=> "add-condition-disable_email_hiding_before_check_box_hide_mail",
+                    :surround       => 'p:contains("check_box :hide_mail")',
+                    :text           => <<STRING_EMAIL
+<% if Setting["plugin_redmine_tiny_features"]["disable_email_hiding"].blank? %>
+  <%= render_original %>
+<% end %>
+STRING_EMAIL

app/overrides/users/show.rb

@@ -0,0 +1,6 @@
+Deface::Override.new :virtual_path  => "users/show",
+                  :name         		=> "add-condition-disable_email_hiding",
+                  :replace      		=> "erb[silent]:contains('unless @user.pref.hide_mail')",
+                  :text         		=> <<STRING_EMAIL
+<% unless @user.pref.hide_mail && Setting["plugin_redmine_tiny_features"]["disable_email_hiding"].blank? && !User.current.allowed_to?(:always_see_user_email_addresses, nil, :global => true) %>
+STRING_EMAIL

app/views/custom_fields/formats/_range.html.erb

@@ -0,0 +1,14 @@
+<p>
+  <label for="custom_field_min_range"><%=l(:label_min_max_range)%></label>
+  <%= f.text_field :min_value, :size => 5, :no_label => true %> -
+  <%= f.text_field :max_value, :size => 5, :no_label => true %>
+</p>
+
+<p>
+  <label for="custom_field_steps"><%=l(:label_steps)%></label>
+  <%= f.text_field :steps, :size => 5, :no_label => true %>
+</p>
+<p>
+  <label><%= l(:field_default_value) %></label>
+  <%= f.text_field :default_value, :size => 5, :no_label => true %>
+</p>

app/views/issues/_edit_closed.html.erb

@@ -34,8 +34,6 @@
             })
             $("#issue-form").on("change", "#issue_status_id", function () {
                 var status_id = parseInt($(this).val())
-                console.log(status_id)
-                console.log($.inArray(status_id, <%= IssueStatus.where(:is_closed => true).pluck(:id).inspect %>))
                 if ($.inArray(status_id, <%= IssueStatus.where(:is_closed => true).pluck(:id).inspect %>) < 0) {
                     showIfIssueOpen()
                 }