diff options
| author | jpl | 2017-03-20 16:21:24 +0100 |
|---|---|---|
| committer | jpl | 2017-03-20 16:21:24 +0100 |
| commit | 516971ceec5919e93105e3b01492090ba2a106cf (patch) | |
| tree | d194a26f6ea698a32b7f45b58abc59b10e0ae83c | |
| parent | c5410dbc633cf5e3eaae35c5cc02325fd963bc0c (diff) | |
| download | chouette-core-516971ceec5919e93105e3b01492090ba2a106cf.tar.bz2 | |
updating pagination display according to last commit
| -rw-r--r-- | app/views/workbenches/show.html.slim | 6 | ||||
| -rw-r--r-- | db/schema.rb | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim index cbc9f3493..93c9ae40d 100644 --- a/app/views/workbenches/show.html.slim +++ b/app/views/workbenches/show.html.slim @@ -13,13 +13,13 @@ .page_content .container-fluid - if params[:q].present? or @wbench_refs.any? - .row.mb-sm - .col-lg-12.text-right + / .row.mb-sm + / .col-lg-12.text-right / = new_pagination @wbench_refs .row .col-lg-12 - / = render 'filters' + = render 'filters' - if @wbench_refs.any? .row diff --git a/db/schema.rb b/db/schema.rb index 78ee57a5c..33d99ee9e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -165,6 +165,22 @@ ActiveRecord::Schema.define(version: 20170320125813) do add_index "connection_links", ["objectid"], :name => "connection_links_objectid_key", :unique => true + create_table "delayed_jobs", force: true do |t| + t.integer "priority", default: 0 + t.integer "attempts", default: 0 + t.text "handler" + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + create_table "exports", force: true do |t| t.integer "referential_id", limit: 8 t.string "status" @@ -834,6 +850,8 @@ ActiveRecord::Schema.define(version: 20170320125813) do add_index "workbenches", ["stop_area_referential_id"], :name => "index_workbenches_on_stop_area_referential_id" Foreigner.load + add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey", dependent: :delete + add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", dependent: :delete add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", dependent: :nullify |