dorsale 3.9.5 → 3.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8986b4eafbaa82abc408062fef4e7c1ea58f956
-  data.tar.gz: 7152f22921f77b3b0c58ec95a71e226153031b10
+  metadata.gz: c35bf78225914a8dfc322164de561790f97b6e49
+  data.tar.gz: 9fd0de39cdcbb701862e92777891924ad6669123
 SHA512:
-  metadata.gz: 4239cdcf922244c447eb8eeb6d0637d0d294f1d856d3a919a1090627685b973ecb1c037efa5d83bd668e731a424482f4b519f0651463441bb0c88450f7e8bfe1
-  data.tar.gz: 4ee06443366cfc89a1390824fa1352554d15e25f65f2290c9de14a7cfb5c2544c2fef87c56d94bc7d693ae25dc2fc47a651c2e6f3d7a9e4ad41316f8c4ffd3c9
+  metadata.gz: 84dd08892c8727c90daa2b55f452b334a75e78a3e434dc2cc955fb3055efd83485850a4dc0908b463fa51b2ec2c8a277308db8a489c6bc2002c562f82819e1f9
+  data.tar.gz: ae773eb9c50e3a42460e7c59a0298e6f5db3ab515fc3c7ae1a7eda3e7ff5148f5009631a6e2cb8c2aa564240357cd77759f0337891e2a9b16179124083c23752

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next version
 
+## 3.9.6
+
+- Tasks : add :on_warning_or_alert scope/filter
+- Tasks : fix redirect after create comment
+
 ## 3.9.5
 
 - Fix BillingMachine preview JS

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -18,7 +18,14 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
   private
 
   def back_url
-    request.referer.presence || url_for(@task)
+    task_path = flyboy_task_path(@task)
+    back_url  = super
+
+    if back_url.to_s.start_with?(task_path)
+      back_url
+    else
+      task_path
+    end
   end
 
   def model

data/app/filters/dorsale/flyboy/small_data/filter_strategy_by_task_state.rb

@@ -1,7 +1,9 @@
 class Dorsale::Flyboy::SmallData::FilterStrategyByTaskState < ::Agilibox::SmallData::FilterStrategy
+  STATES = Dorsale::Flyboy::Task::STATES + %w(on_warning_or_alert)
+
   def apply(query, value)
-    if value.in?(Dorsale::Flyboy::Task::STATES)
-      query.send(value)
+    if value.in?(STATES)
+      query.public_send(value)
     else
       query
     end

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -26,7 +26,7 @@ module Dorsale::Flyboy::ApplicationHelper
   end
 
   def flyboy_status_for_filters_select
-    Dorsale::Flyboy::Task::STATES.map do |state|
+    Dorsale::Flyboy::SmallData::FilterStrategyByTaskState::STATES.map do |state|
       [Dorsale::Flyboy::Task.t("state.#{state}"), state]
     end
   end

data/app/models/dorsale/flyboy/task.rb

@@ -48,6 +48,10 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
       .where("#{table_name}.term <= ?", Date.current)
   }
 
+  scope :on_warning_or_alert, -> {
+    undone.where("#{table_name}.reminder_date <= :d OR #{table_name}.term <= :d", d: Date.current)
+  }
+
   scope :delayed,  -> { where(done: false).where("#{table_name}.term < ?", Date.current)  }
   scope :today,    -> { where(done: false).where("#{table_name}.term = ?", Date.current)  }
   scope :tomorrow, -> { where(done: false).where("#{table_name}.term = ?", Date.tomorrow) }

data/config/locales/flyboy.en.yml

@@ -60,6 +60,7 @@ en:
         ontime: "On time"
         onwarning: "Reminder outdated"
         onalert: "Term outdated"
+        on_warning_or_alert: "Reminder or term outdated"
 
       dorsale/flyboy/task_comment:
         progress: "Progress"

data/config/locales/flyboy.fr.yml

@@ -62,6 +62,7 @@ fr:
         ontime: "À temps"
         onwarning: "Rappel dépassé"
         onalert: "Échéance dépassée"
+        on_warning_or_alert: "Rappel ou échéance dépassé"
 
       dorsale/flyboy/task_comment:
         progress: "Progression"

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.5"
+  VERSION = "3.9.6"
 end

data/spec/controllers/dorsale/flyboy/task_comments_controller_spec.rb

@@ -18,13 +18,21 @@ describe Dorsale::Flyboy::TaskCommentsController, type: :controller do
       expect(assigns(:task_comment).persisted?).to be true
     end
 
-    it "should redirect to referrer" do
-      request.env["HTTP_REFERER"] = "/abc"
+    it "should redirect to referrer if referrer is task" do
+      url = flyboy_task_path(task) + "?sort=xxx"
+      request.env["HTTP_REFERER"] = url
       post :create, params: valid_params
-      expect(response).to redirect_to "/abc"
+      expect(response).to redirect_to url
     end
 
-    it "should redirect to task" do
+    it "should redirect to task if referrer is not task" do
+      url = "/anywhere"
+      request.env["HTTP_REFERER"] = url
+      post :create, params: valid_params
+      expect(response).to redirect_to flyboy_task_path(task)
+    end
+
+    it "should redirect to task if referrer is missing" do
       post :create, params: valid_params
       expect(response).to redirect_to flyboy_task_path(task)
     end

data/spec/models/dorsale/flyboy/task_spec.rb

@@ -219,6 +219,10 @@ describe Dorsale::Flyboy::Task do
       )
     }
 
+    it "should return on_warning_or_alert" do
+      expect(described_class.on_warning_or_alert).to contain_exactly(task_onwarning, task_onalert)
+    end
+
     it "should return :done" do
       expect(task_done.state).to eq "done"
       expect(described_class.done).to eq [task_done]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.5
+  version: 3.9.6
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails