enju_question 0.1.0.pre3 → 0.1.0.pre4
Sign up to get free protection for your applications and to get access to all the features.
- data/app/models/answer.rb +6 -6
- data/app/models/answer_has_item.rb +3 -3
- data/app/models/question.rb +7 -7
- data/app/views/questions/_index.html.erb +1 -1
- data/app/views/questions/_index_user.html.erb +1 -1
- data/app/views/questions/index.mobile.erb +1 -1
- data/lib/enju_question/version.rb +1 -1
- data/spec/cassette_library/enju_ndl/crd.yml +426 -435
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/solr/data/test/index/{_l.fdt → _26.fdt} +0 -0
- data/spec/dummy/solr/data/test/index/_26.fdx +0 -0
- data/spec/dummy/solr/data/test/index/{_l.fnm → _26.fnm} +1 -1
- data/spec/dummy/solr/data/test/index/{_l.frq → _26.frq} +0 -0
- data/spec/dummy/solr/data/test/index/{_l.nrm → _26.nrm} +0 -0
- data/spec/dummy/solr/data/test/index/{_l.prx → _26.prx} +0 -0
- data/spec/dummy/solr/data/test/index/{_l.tii → _26.tii} +0 -0
- data/spec/dummy/solr/data/test/index/{_l.tis → _26.tis} +0 -0
- data/spec/dummy/solr/data/test/index/segments.gen +0 -0
- data/spec/dummy/solr/data/test/index/segments_4d +0 -0
- data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
- data/spec/fixtures/answer_has_items.yml +3 -3
- data/spec/fixtures/answers.yml +6 -6
- data/spec/fixtures/questions.yml +7 -7
- data/spec/models/answer_has_item_spec.rb +3 -3
- data/spec/models/answer_spec.rb +6 -6
- data/spec/models/question_spec.rb +7 -7
- metadata +49 -28
- data/spec/dummy/solr/data/test/index/_l.fdx +0 -0
- data/spec/dummy/solr/data/test/index/segments_19 +0 -0
data/app/models/answer.rb
CHANGED
@@ -39,18 +39,18 @@ class Answer < ActiveRecord::Base
|
|
39
39
|
end
|
40
40
|
end
|
41
41
|
|
42
|
-
|
43
42
|
# == Schema Information
|
44
43
|
#
|
45
44
|
# Table name: answers
|
46
45
|
#
|
47
|
-
# id :integer
|
48
|
-
# user_id :integer
|
49
|
-
# question_id :integer
|
46
|
+
# id :integer not null, primary key
|
47
|
+
# user_id :integer not null
|
48
|
+
# question_id :integer not null
|
50
49
|
# body :text
|
51
|
-
# created_at :datetime
|
52
|
-
# updated_at :datetime
|
50
|
+
# created_at :datetime not null
|
51
|
+
# updated_at :datetime not null
|
53
52
|
# deleted_at :datetime
|
53
|
+
# shared :boolean default(TRUE), not null
|
54
54
|
# state :string(255)
|
55
55
|
# item_identifier_list :text
|
56
56
|
# url_list :text
|
@@ -11,11 +11,11 @@ end
|
|
11
11
|
#
|
12
12
|
# Table name: answer_has_items
|
13
13
|
#
|
14
|
-
# id :integer
|
14
|
+
# id :integer not null, primary key
|
15
15
|
# answer_id :integer
|
16
16
|
# item_id :integer
|
17
17
|
# position :integer
|
18
|
-
# created_at :datetime
|
19
|
-
# updated_at :datetime
|
18
|
+
# created_at :datetime not null
|
19
|
+
# updated_at :datetime not null
|
20
20
|
#
|
21
21
|
|
data/app/models/question.rb
CHANGED
@@ -71,16 +71,16 @@ end
|
|
71
71
|
#
|
72
72
|
# Table name: questions
|
73
73
|
#
|
74
|
-
# id :integer
|
75
|
-
# user_id :integer
|
74
|
+
# id :integer not null, primary key
|
75
|
+
# user_id :integer not null
|
76
76
|
# body :text
|
77
|
-
# shared :boolean
|
78
|
-
# answers_count :integer
|
79
|
-
# created_at :datetime
|
80
|
-
# updated_at :datetime
|
77
|
+
# shared :boolean default(TRUE), not null
|
78
|
+
# answers_count :integer default(0), not null
|
81
79
|
# deleted_at :datetime
|
82
80
|
# state :string(255)
|
83
|
-
# solved :boolean
|
81
|
+
# solved :boolean default(FALSE), not null
|
84
82
|
# note :text
|
83
|
+
# created_at :datetime not null
|
84
|
+
# updated_at :datetime not null
|
85
85
|
#
|
86
86
|
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div id="content_list">
|
5
5
|
<%= form_for :questions, :url => questions_path, :html => {:method => 'get'} do -%>
|
6
6
|
<p>
|
7
|
-
<%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
|
7
|
+
<%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
|
8
8
|
<%= submit_tag t('page.search') -%>
|
9
9
|
</p>
|
10
10
|
<%- end -%>
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<div id="content_list">
|
4
4
|
<%= form_for :questions, :url => user_questions_path(@user), :html => {:method => 'get'} do -%>
|
5
5
|
<p>
|
6
|
-
<%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
|
6
|
+
<%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
|
7
7
|
<%= submit_tag t('page.search') -%>
|
8
8
|
</p>
|
9
9
|
<%- end -%>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<div data-role="content">
|
6
6
|
<div data-role="fieldcontain">
|
7
7
|
<%= form_for :questions, :html => {:method => 'get'} do -%>
|
8
|
-
|
8
|
+
<%= label_tag :search_form_top, t('page.search_term') -%>:
|
9
9
|
<%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
|
10
10
|
<%= submit_tag t('page.search') -%>
|
11
11
|
<% end %>
|