Dmitry Yu Okunev лет назад: 6
Родитель
Сommit
a3724cc655

+ 10 - 1
app/controllers/passes_controller.rb

@@ -49,10 +49,19 @@ class PassesController < ApplicationController
 	end
 
 	def index
-		if params[:lastname].nil? and params[:id].nil?
+		if params[:lastname].nil? and params[:id].nil? and params[:q].nil?
 			@passes = Pass.where(:id => -1)
 			return self.commonindex
 		end
+
+		unless params[:q].nil?
+			if params[:q].match(/^\d+$/)
+				params[:id] = params[:q].to_i
+			else
+				params[:lastname] = params[:q]
+			end
+		end
+
 		if params[:lastname].nil?
 			@passes = Pass.preload(:person).where(:id => params[:id])
 		else

+ 1 - 1
app/views/passes/index.html.erb

@@ -1,7 +1,7 @@
 <h1>Записи из БД ОФЗ</h1>
 <%= form_tag passes_index_path, :method => 'get' do %>
 	<p>
-		<%= text_field_tag :lastname, params[:lastname], :placeholder => t(:lastname) %>
+		<%= text_field_tag :q, params[:q], :placeholder => "#{t(:lastname)} #{t(:or)} #{t(:identifier)}", :size => 30 %>
 		<%= submit_tag t :search, :name => nil %>
 	</p>
 <% end %>

+ 3 - 0
config/locales/en.yml

@@ -4,3 +4,6 @@ en:
  anonymous: "Anonymous"
  lastname: "Lastname"
  search: "Search"
+ or: "or"
+ number: "number"
+ identifier: "ID"

+ 3 - 0
config/locales/ru.yml

@@ -4,3 +4,6 @@ ru:
  anonymous: "Аноним"
  lastname: "Фамилия"
  search: "Поиск"
+ or: "или"
+ number: "число"
+ identifier: "идентификатор"