barbeque 1.3.0 → 1.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 853b4590c177e2175fbfbbaa8ee224541e0b4c63
4
- data.tar.gz: 111e6f0c3676331b23186693eb129dbb65bf0293
3
+ metadata.gz: a8f030f3f8e068ff5cba42a48c7f8b70e989f774
4
+ data.tar.gz: 74133d8cabe50181253107f9d89e4740c0a8e575
5
5
  SHA512:
6
- metadata.gz: c216e10752fdabe61e5ce2bb9e57915f497402a21a7d397289e893fdef268dda1303c1e9ca9d427210f50c82c118cb29cb2013e2455cab9ded58403fc20672bf
7
- data.tar.gz: 56c8c82523c427d74be374dc586368e4e03407ef3fe9d1bfaf3812b9d8a7a9c7a6d87f18f6ed476215a1afba166d43c05b4ddf39a7fc752a8f76c29a596f36bc
6
+ metadata.gz: fbc43a2e2b313b85b83c3050b30778ed4c6cdf33d0f9fb9671caa66df9dfa672f83f49f17669dcbad732331f678be3f401759854b8abf622b58f880185dfeb7c
7
+ data.tar.gz: dd4f7f067c2adaf567c9f591085cde404c89edd8e49bf78611879d4cf539e6ae1b79073283705abc77fc697596cf42b02d0a83d71f8d5d3515bd84e881dce829
@@ -6,6 +6,10 @@ class Barbeque::JobDefinitionsController < Barbeque::ApplicationController
6
6
  def show
7
7
  @job_definition = Barbeque::JobDefinition.find(params[:id])
8
8
  @job_executions = @job_definition.job_executions.order(id: :desc).page(params[:page])
9
+ @status = params[:status].presence.try(&:to_i)
10
+ if @status
11
+ @job_executions = @job_executions.where(status: @status)
12
+ end
9
13
  end
10
14
 
11
15
  def new
@@ -51,6 +51,20 @@
51
51
  Statistics
52
52
 
53
53
  .box-body
54
+ .nav-tabs-custom
55
+ %ul.nav.nav-tabs
56
+ %li.dropdown
57
+ %a.dropdown-toggle{href: '#', data: { toggle: 'dropdown' }}
58
+ Filter by status
59
+ %span.caret
60
+ %ul.dropdown-menu
61
+ - Barbeque::JobExecution.statuses.each do |name, value|
62
+ %li{role: 'presentation'}
63
+ = link_to(url_for(status: value), role: 'menuitem', class: 'active') do
64
+ - if value == @status
65
+ %b= name
66
+ - else
67
+ = name
54
68
  - if @job_executions.present?
55
69
  %table.table.table-bordered
56
70
  %thead
@@ -79,12 +93,12 @@
79
93
  Retry
80
94
  .row
81
95
  .col-xs-4
82
- = link_to url_for(page: @job_executions.prev_page),
96
+ = link_to url_for(request.query_parameters.merge(page: @job_executions.prev_page)),
83
97
  class: "btn btn-default btn-sm btn-block #{'disabled' unless @job_executions.prev_page}" do
84
98
  %i.fa.fa-angle-left
85
99
  New
86
100
  .col-xs-4.col-xs-offset-4
87
- = link_to url_for(page: @job_executions.next_page),
101
+ = link_to url_for(request.query_parameters.merge(page: @job_executions.next_page)),
88
102
  class: "btn btn-default btn-sm btn-block #{'disabled' unless @job_executions.next_page}" do
89
103
  Old
90
104
  %i.fa.fa-angle-right
@@ -1,3 +1,3 @@
1
1
  module Barbeque
2
- VERSION = '1.3.0'
2
+ VERSION = '1.3.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: barbeque
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takashi Kokubun
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-21 00:00:00.000000000 Z
11
+ date: 2017-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: adminlte2-rails