#46 restrict

yegor256 · Oct 3, 2019 · 038fa7a · 038fa7a
1 parent 7398a56
commit 038fa7a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/objects/tasks.rb b/objects/tasks.rb
@@ -62,7 +62,9 @@ def postpone(id, seconds)
     @pgsql.transaction do |t|
       t.exec('DELETE FROM task WHERE id = $1', [id])
       s = (Time.now + seconds).strftime('%d-%m-%Y')
-      Rsk::Plans.new(@pgsql, row['project'].to_i).get(row['id'].to_i, row['part'].to_i).schedule = s
+      plan = Rsk::Plans.new(@pgsql, row['project'].to_i).get(row['id'].to_i, row['part'].to_i)
+      raise Rsk::Urror, "Can't postpone plan ##{row['id']}" if /^[a-z]+$/.match?(plan.schedule)
+      plan.schedule = s
     end
   end
 

diff --git a/views/tasks.haml b/views/tasks.haml
@@ -61,11 +61,14 @@
         %span.item<
           &= t[:schedule]
         %a.item{href: iri.cut('/tasks/done').add(id: t[:id])} Done
-        %span.item
-          Later:
-          %a.item{href: iri.cut('/tasks/later').add(id: t[:id], period: 'week')} week
-          %a.item{href: iri.cut('/tasks/later').add(id: t[:id], period: 'month')} month
-          %a.item{href: iri.cut('/tasks/later').add(id: t[:id], period: 'quarter')} quarter
+        - unless /^[a-z]+$/.match?(t[:schedule])
+          %span.item
+            Later:
+            %a{href: iri.cut('/tasks/later').add(id: t[:id], period: 'week')} week
+            = '|'
+            %a{href: iri.cut('/tasks/later').add(id: t[:id], period: 'month')} month
+            = '|'
+            %a{href: iri.cut('/tasks/later').add(id: t[:id], period: 'quarter')} quarter
   = Haml::Engine.new(File.read('views/_paging.haml')).render(self, locals.merge(count: tasks.count))
 
 %p