diff options
| author | vlatka pavisic | 2016-11-15 17:47:23 +0100 |
|---|---|---|
| committer | vlatka pavisic | 2016-11-15 17:47:31 +0100 |
| commit | 8e3734f097a93eb34a809e18cbbb57b0dde91835 (patch) | |
| tree | 7ce1bb9c57a9865cacfa6ce10530fe48cf11f912 | |
| parent | 8be2d83715d2cf79ae47750e6d34f29d6f2f7f6d (diff) | |
| download | chouette-core-8e3734f097a93eb34a809e18cbbb57b0dde91835.tar.bz2 | |
Refs #1938 : Lines can be searched by comments
| -rw-r--r-- | app/views/lines/index.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 | ||||
| -rw-r--r-- | db/schema.rb | 16 |
4 files changed, 3 insertions, 19 deletions
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim index 11aa1810a..a85f6a015 100644 --- a/app/views/lines/index.html.slim +++ b/app/views/lines/index.html.slim @@ -3,7 +3,7 @@ = search_form_for @q, url: line_referential_lines_path(@line_referential), remote: true, html: {method: :get, class: "form", id: "search", role: "form"} do |f| .well.well-sm .input-group - = f.text_field :name_or_number_or_objectid_cont, placeholder: t('.name_or_number_or_objectid'), class: 'form-control' + = f.text_field :name_or_number_or_objectid_or_comment_cont, placeholder: t('.name_or_number_or_objectid_or_comment'), class: 'form-control' .input-group-btn button.btn.btn-primary type="submit" diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 4bc485180..84285bbcb 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -23,7 +23,7 @@ en: deactivated: "Disabled line" title: "Lines" name_or_number: "Search by name or number..." - name_or_number_or_objectid: "Search by name, number or objectid..." + name_or_number_or_objectid_or_comment: "Search by name, number, objectid or comment..." no_networks: "No networks" no_companies: "No companies" no_group_of_lines: "No group of lines" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 9e749f038..b5a13c34a 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -23,7 +23,7 @@ fr: deactivated: "Ligne désactivée" title: "Lignes" name_or_number: "Recherche par nom ou indice..." - name_or_number_or_objectid: "Recherche par nom, indice ou objectid..." + name_or_number_or_objectid_or_comment: "Recherche par nom, indice, objectid ou commentaire..." no_networks: "Aucun réseaux" no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" diff --git a/db/schema.rb b/db/schema.rb index e4b85109c..9eb9fc7b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -146,22 +146,6 @@ ActiveRecord::Schema.define(version: 20161115142708) 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" |