added filters and file and editor search

app/controllers/universal_tables_controller.rb

@@ -118,6 +118,7 @@ when "file"
 			}
 		end
 	end
+
 	def get_query(params)
 		if params["column"].present?
 			q = {params["column"] => params["q"]}
@@ -146,10 +147,15 @@ end
 				# 	regex = Regexp.union(regexes.map{|word| Regexp.new(".*"+word+".*", "i")})
 				# end
 				regex = Regexp.new(".*"+v+".*", "i")
-				if column.type == "text"
+				case column.type
+				when "text"
 					columns = column.column_entries.any_of([{"text.en" => regex}, {"text.zh_tw" => regex}])
-				elsif column.type == "editor"
+				when "editor"
 					columns = column.column_entries.any_of([{"content.en" => regex}, {"content.zh_tw" => regex}])
+				when "file"
+					column_ids = column.column_entries.pluck(:id)
+					filtered_column_ids = ColumnEntryFile.where(:column_entry_id.in => column_ids).any_of([{ "file_title.en" => regex },{"file_title.zh_tw" => regex }]).pluck(:column_entry)
+					columns = ColumnEntry.where(:id.in => filtered_column_ids)
 				end
 				# .or(:"content.en" => regex).or(:"content.zh_tw" => regex)
 				tmp = columns.pluck(:table_entry_id)
@@ -292,7 +298,7 @@ end
 			# csrf_input = "<input type=\"hidden\" name=\"authenticity_token\" value=\"#{csrf_value}\">"
 			csrf_input = ""
 			have_serial_number = (page.layout != 'index1')
-			table_heads = table.table_columns.where(:display_in_index => true).asc(:order).collect do |tc|
+			table_heads = table.table_columns.where(:is_searchable => true).asc(:order).collect do |tc|
 				field_key = tc.key
 				field_value = params_q[field_key]
 				field_value = nil if field_value.blank?
@@ -310,7 +316,7 @@ end
 					search = "hide"
 					sort_url = "#"
 					sort = "hide"
-				when "editor"
+				when "editor","file"
 					sort_url = "#"
 					sort = "hide"
 					sort_class = "sort hide"

app/views/admin/universal_tables/_column.html.erb

@@ -81,6 +81,13 @@
           <%= f.check_box :is_searchable %> Searchable
         </label>
       </span>
+      <% if column.type == "file" || column.type == "editor" %>
+        <span class="link_to_show2">
+          <label class="checkbox inline attributes-checkbox ">
+            <%= f.check_box :is_searchable %> Searchable
+          </label>
+        </span>
+      <% end %>
       <% select_values = UTable::DATE_FORMATS.collect{|ft| [ft.upcase,ft]} %>
        <label class="checkbox date_format inline attributes-checkbox <%= column.type == "date" || column.type == "period"  ? "" : "hide" %>">
         Date Format <%= f.select :date_format, select_values%>

app/views/admin/universal_tables/_index.html.erb

@@ -32,14 +32,14 @@
 			<td>
 				<%= table.table_entries.count %>
 			</td>
-			<td>
+			<td class="lasttd">
 			<% if can_edit %>
 				<form action="/admin/universal_tables/import_data_from_excel" method="post" enctype="multipart/form-data" class="import_from_excel_form">
 					<%= hidden_field_tag :authenticity_token, form_authenticity_token %>
-					<input type="file" name="import_data" />
+					<input class="import_data" type="file" name="import_data" />
 					<button class="btn btn-primary btn-small"><i class="icons-upload"></i></button>
 					<input type="hidden" name="universal_table_id" value="<%= table.id.to_s %>" />
-					<a href="<%= admin_universal_table_export_structure_path(table, :format => "xlsx") %>"><%= t("universal_table.export_structure") %></a>
+					<a class="Downloadtablestructure" href="<%= admin_universal_table_export_structure_path(table, :format => "xlsx") %>"><%= t("universal_table.export_structure") %></a>
 				</form>
 			<% end %>
 			</td>
@@ -47,3 +47,15 @@
 	<% end %>
 </tbody>
 </table>
+<style>
+	.import_data{
+		max-width: 180px;
+	}
+	.lasttd{
+		width: 40%;
+	}
+	.Downloadtablestructure{
+		padding-left: 3em;
+	}
+	
+</style>

app/views/admin/universal_tables/_table_form.html.erb

@@ -121,6 +121,13 @@
       label.addClass("hide");
       label.find("input[type=checkbox]").prop("checked",false);
     }
+    label = el.parent().find("span.link_to_show2");
+    if(el.val() == "editor" || el.val() == "file"){
+      label.removeClass("hide");
+    }else{
+      label.addClass("hide");
+      label.find("input[type=checkbox]").prop("checked",false);
+    }
     label = el.parent().find("label.date_format");
     if(el.val() == "date" || el.val() == "period"){
       label.removeClass("hide");