cafe-grader-web

Commit r804:b80b4e632bb0 public

parent | child
Description:
announcement on top menu bar
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r804:b80b4e632bb0 - - 9 files changed: 122 inserted, 58 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,25
1 + = simple_form_for(@announcement) do |f|
2 + - if @announcement.errors.any?
3 + .form-row
4 + .col-sm-12
5 + #error_explanation.alert.alert-dismissable.alert-danger
6 + %button.close{type: "button", data: { dismiss: "alert"}, aria: {hidden: "true"}} ×
7 + %h3= "เกิดปัญหาในการบันทึกข้อมูลเนื่องจาก"
8 + %ul
9 + - @announcement.errors.full_messages.each do |message|
10 + %li= message
11 + .form-row
12 + .col-md-6.col-12
13 + -# = f.input :lock_version, as: :hidden
14 + = f.input :title
15 + = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'
16 + = f.input :body
17 + = f.input :author
18 + = f.input :published
19 + = f.input :frontpage, label: 'Display in the front page only?'
20 + = f.input :on_nav_bar, label: 'Show on menu bar?', wrapper: :custom_boolean
21 + = f.input :contest_only, label: 'Display in contest only?'
22 + = f.submit "Create", class: 'btn btn-primary'
23 + -if content_for?(:form_buttons)
24 + = yield(:form_buttons)
25 + / = link_to 'Back', announcements_path, class: 'btn btn-default'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddOnNavBarToAnnouncement < ActiveRecord::Migration[5.2]
2 + def change
3 + add_column :announcements, :on_nav_bar, :boolean, default: false
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -108,9 +108,9
108 108 end
109 109 end
110 110
111 111 private
112 112
113 113 def announcement_params
114 - params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title)
114 + params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only, :title, :on_nav_bar)
115 115 end
116 116 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,12 +1,13
1 1 require 'ipaddr'
2 2
3 3 class ApplicationController < ActionController::Base
4 4 protect_from_forgery
5 5
6 6 before_action :current_user
7 + before_action :nav_announcement
7 8
8 9 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
9 10 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
10 11 WHITELIST_IGNORE_CONF_KEY = 'right.whitelist_ignore'
11 12 WHITELIST_IP_CONF_KEY = 'right.whitelist_ip'
12 13
@@ -19,12 +20,16
19 20 # Returns the current logged-in user (if any).
20 21 def current_user
21 22 return nil unless session[:user_id]
22 23 @current_user ||= User.find(session[:user_id])
23 24 end
24 25
26 + def nav_announcement
27 + @nav_announcement = Announcement.where(on_nav_bar: true)
28 + end
29 +
25 30 def admin_authorization
26 31 return false unless check_valid_login
27 32 user = User.includes(:roles).find(session[:user_id])
28 33 unless user.admin?
29 34 unauthorized_redirect
30 35 return false
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,6 +1,13
1 + %h1 Edit Announcement
2 +
3 + -content_for(:form_buttons) do
4 + = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5 +
6 + = render 'form'
7 + -# old style
1 8 .container-fluid
2 9 %h1 Editing announcement
3 10 = error_messages_for :announcement
4 11 .row
5 12 .col-md-6
6 13 = form_for(@announcement) do |f|
@@ -24,11 +31,15
24 31 .checkbox
25 32 %label
26 33 = f.check_box :frontpage
27 34 Show on front page?
28 35 .checkbox
29 36 %label
37 + = f.check_box :on_nav_bar
38 + Show on top menu bar?
39 + .checkbox
40 + %label
30 41 = f.check_box :contest_only
31 42 Show only in contest?
32 43 = f.submit "Update", class: 'btn btn-primary'
33 44 = link_to 'Show', @announcement, class: 'btn btn-default'
34 45 = link_to 'Back', announcements_path, class: 'btn btn-default'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,7 +1,14
1 1 %h1 New announcement
2 +
3 + -content_for(:form_buttons) do
4 + = link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5 +
6 + = render 'form'
7 +
8 + -# old style
2 9 = error_messages_for :announcement
3 10 = simple_form_for(@announcement) do |f|
4 11 .row
5 12 .col-md-6
6 13 = f.input :title
7 14 = f.input :notes, label: 'Notes (shown internally, used to organize announcements)'
@@ -9,6 +16,7
9 16 = f.input :author
10 17 = f.input :published
11 18 = f.input :frontpage, label: 'Display in the front page only?'
12 19 = f.input :contest_only, label: 'Display in contest only?'
13 20 = f.button :submit, "Create", class: 'btn btn-primary'
14 21 = link_to 'Back', announcements_path, class: 'btn btn-default'
22 +
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -14,11 +14,14
14 14 %b Published:
15 15 = h @announcement.published
16 16 %p
17 17 %b Show on front page:
18 18 = h @announcement.frontpage
19 19 %p
20 + %b Show on top menu bar:
21 + = h @announcement.on_nav_bar
22 + %p
20 23 %b Show only in contest:
21 24 = h @announcement.contest_only
22 25 = link_to 'Edit', edit_announcement_path(@announcement)
23 26 |
24 27 = link_to 'Back', announcements_path
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -67,12 +67,18
67 67 = add_menu( 'Submission Report', 'report', 'submission')
68 68 = add_menu( 'Login Report', 'report', 'login')
69 69 - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
70 70 =link_to "#{ungraded} backlogs!",
71 71 graders_list_path,
72 72 class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
73 + / announcement
74 + - @nav_announcement.each do |ann|
75 + %p.navbar-text
76 + = ann.body.html_safe
77 +
78 +
73 79
74 80 %ul.nav.navbar-nav.navbar-right
75 81 = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
76 82 = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
77 83 - if GraderConfiguration['system.user_setting_enabled']
78 84 = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -7,77 +7,78
7 7 # system, you should be using db:schema:load, not running all the migrations
8 8 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9 9 # you'll amass, the slower it'll run and the greater likelihood for issues).
10 10 #
11 11 # It's strongly recommended that you check this file into your version control system.
12 12
13 - ActiveRecord::Schema.define(version: 2020_08_13_083020) do
13 + ActiveRecord::Schema.define(version: 2021_01_24_101028) do
14 14
15 - create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
15 + create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
16 16 t.string "author"
17 17 t.text "body"
18 18 t.boolean "published"
19 - t.datetime "created_at"
20 - t.datetime "updated_at"
19 + t.datetime "created_at", null: false
20 + t.datetime "updated_at", null: false
21 21 t.boolean "frontpage", default: false
22 22 t.boolean "contest_only", default: false
23 23 t.string "title"
24 24 t.string "notes"
25 + t.boolean "on_nav_bar", default: false
25 26 end
26 27
27 - create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
28 + create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
28 29 t.string "title"
29 30 t.boolean "enabled"
30 - t.datetime "created_at"
31 - t.datetime "updated_at"
31 + t.datetime "created_at", null: false
32 + t.datetime "updated_at", null: false
32 33 t.string "name"
33 34 end
34 35
35 - create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
36 + create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
36 37 t.integer "contest_id"
37 38 t.integer "problem_id"
38 39 end
39 40
40 - create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
41 + create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
41 42 t.integer "contest_id"
42 43 t.integer "user_id"
43 44 end
44 45
45 - create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
46 + create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
46 47 t.string "name"
47 - t.datetime "created_at"
48 - t.datetime "updated_at"
48 + t.datetime "created_at", null: false
49 + t.datetime "updated_at", null: false
49 50 end
50 51
51 - create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
52 + create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
52 53 t.text "body"
53 54 t.boolean "markdowned"
54 - t.datetime "created_at"
55 - t.datetime "updated_at"
55 + t.datetime "created_at", null: false
56 + t.datetime "updated_at", null: false
56 57 end
57 58
58 - create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
59 + create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
59 60 t.string "key"
60 61 t.string "value_type"
61 62 t.string "value"
62 - t.datetime "created_at"
63 - t.datetime "updated_at"
63 + t.datetime "created_at", null: false
64 + t.datetime "updated_at", null: false
64 65 t.text "description"
65 66 end
66 67
67 - create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
68 + create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
68 69 t.string "host"
69 70 t.integer "pid"
70 71 t.string "mode"
71 72 t.boolean "active"
72 - t.datetime "created_at"
73 - t.datetime "updated_at"
73 + t.datetime "created_at", null: false
74 + t.datetime "updated_at", null: false
74 75 t.integer "task_id"
75 76 t.string "task_type"
76 77 t.boolean "terminated"
77 - t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid"
78 + t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
78 79 end
79 80
80 81 create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
81 82 t.string "name"
82 83 t.string "description"
83 84 t.boolean "enabled", default: true
@@ -92,47 +93,47
92 93 create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
93 94 t.integer "group_id", null: false
94 95 t.integer "user_id", null: false
95 96 t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
96 97 end
97 98
98 - create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
99 + create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
99 100 t.integer "user_id"
100 101 t.string "ip_address"
101 - t.datetime "created_at"
102 - t.datetime "updated_at"
102 + t.datetime "created_at", null: false
103 + t.datetime "updated_at", null: false
103 104 t.string "status"
104 105 t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
105 106 end
106 107
107 - create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
108 + create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
108 109 t.string "name", limit: 10
109 110 t.string "pretty_name"
110 111 t.string "ext", limit: 10
111 112 t.string "common_ext"
112 113 end
113 114
114 - create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
115 + create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
115 116 t.integer "user_id"
116 117 t.string "ip_address"
117 - t.datetime "created_at"
118 - t.datetime "updated_at"
118 + t.datetime "created_at", null: false
119 + t.datetime "updated_at", null: false
119 120 t.index ["user_id"], name: "index_logins_on_user_id"
120 121 end
121 122
122 - create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
123 + create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
123 124 t.integer "sender_id"
124 125 t.integer "receiver_id"
125 126 t.integer "replying_message_id"
126 127 t.text "body"
127 128 t.boolean "replied"
128 - t.datetime "created_at"
129 - t.datetime "updated_at"
129 + t.datetime "created_at", null: false
130 + t.datetime "updated_at", null: false
130 131 end
131 132
132 - create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
133 + create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
133 134 t.string "name", limit: 30
134 135 t.string "full_name"
135 136 t.integer "full_score"
136 137 t.date "date_added"
137 138 t.boolean "available"
138 139 t.string "url"
@@ -148,60 +149,60
148 149 t.integer "tag_id"
149 150 t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
150 151 t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
151 152 t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
152 153 end
153 154
154 - create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
155 + create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
155 156 t.string "name"
156 157 t.string "controller"
157 158 t.string "action"
158 159 end
159 160
160 - create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
161 + create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
161 162 t.integer "right_id"
162 163 t.integer "role_id"
163 164 t.index ["role_id"], name: "index_rights_roles_on_role_id"
164 165 end
165 166
166 - create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
167 + create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
167 168 t.string "name"
168 169 end
169 170
170 - create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
171 + create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
171 172 t.integer "role_id"
172 173 t.integer "user_id"
173 174 t.index ["user_id"], name: "index_roles_users_on_user_id"
174 175 end
175 176
176 - create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
177 + create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
177 178 t.string "session_id"
178 179 t.text "data"
179 180 t.datetime "updated_at"
180 181 t.index ["session_id"], name: "index_sessions_on_session_id"
181 182 t.index ["updated_at"], name: "index_sessions_on_updated_at"
182 183 end
183 184
184 - create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
185 + create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
185 186 t.string "name"
186 187 t.boolean "started"
187 188 t.datetime "start_time"
188 - t.datetime "created_at"
189 - t.datetime "updated_at"
189 + t.datetime "created_at", null: false
190 + t.datetime "updated_at", null: false
190 191 t.integer "country_id"
191 192 t.string "password"
192 193 end
193 194
194 - create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
195 + create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
195 196 t.integer "user_id"
196 197 t.integer "submission_id"
197 - t.datetime "created_at"
198 - t.datetime "updated_at"
198 + t.datetime "created_at", null: false
199 + t.datetime "updated_at", null: false
199 200 end
200 201
201 - create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
202 + create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
202 203 t.integer "user_id"
203 204 t.integer "problem_id"
204 205 t.integer "language_id"
205 206 t.text "source", limit: 16777215
206 207 t.binary "binary"
207 208 t.datetime "submitted_at"
@@ -226,43 +227,43
226 227 t.text "description"
227 228 t.boolean "public"
228 229 t.datetime "created_at", null: false
229 230 t.datetime "updated_at", null: false
230 231 end
231 232
232 - create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
233 + create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
233 234 t.integer "submission_id"
234 235 t.datetime "created_at"
235 236 t.integer "status"
236 237 t.datetime "updated_at"
237 238 t.index ["submission_id"], name: "index_tasks_on_submission_id"
238 239 end
239 240
240 - create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
241 + create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
241 242 t.integer "problem_id"
242 243 t.text "input", limit: 16777215
243 244 t.text "solution", limit: 16777215
244 - t.datetime "created_at"
245 - t.datetime "updated_at"
245 + t.datetime "created_at", null: false
246 + t.datetime "updated_at", null: false
246 247 end
247 248
248 - create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
249 + create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
249 250 t.integer "user_id"
250 251 t.integer "problem_id"
251 252 t.integer "submission_id"
252 253 t.string "input_file_name"
253 254 t.string "output_file_name"
254 255 t.string "running_stat"
255 256 t.integer "status"
256 - t.datetime "updated_at"
257 + t.datetime "updated_at", null: false
257 258 t.datetime "submitted_at"
258 259 t.datetime "compiled_at"
259 260 t.text "compiler_message"
260 261 t.datetime "graded_at"
261 262 t.string "grader_comment"
262 - t.datetime "created_at"
263 + t.datetime "created_at", null: false
263 264 t.float "running_time"
264 265 t.string "exit_status"
265 266 t.integer "memory_usage"
266 267 t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
267 268 end
268 269
@@ -275,36 +276,36
275 276 t.text "sol", limit: 4294967295
276 277 t.datetime "created_at"
277 278 t.datetime "updated_at"
278 279 t.index ["problem_id"], name: "index_testcases_on_problem_id"
279 280 end
280 281
281 - create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
282 + create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
282 283 t.integer "user_id"
283 284 t.datetime "started_at"
284 - t.datetime "created_at"
285 - t.datetime "updated_at"
285 + t.datetime "created_at", null: false
286 + t.datetime "updated_at", null: false
286 287 t.boolean "forced_logout"
287 288 end
288 289
289 - create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
290 + create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
290 291 t.string "login", limit: 50
291 292 t.string "full_name"
292 293 t.string "hashed_password"
293 294 t.string "salt", limit: 5
294 295 t.string "alias"
295 296 t.string "email"
296 297 t.integer "site_id"
297 298 t.integer "country_id"
298 299 t.boolean "activated", default: false
299 300 t.datetime "created_at"
300 301 t.datetime "updated_at"
301 - t.string "section"
302 302 t.boolean "enabled", default: true
303 303 t.string "remark"
304 304 t.string "last_ip"
305 + t.string "section"
305 306 t.index ["login"], name: "index_users_on_login", unique: true
306 307 end
307 308
308 309 add_foreign_key "problems_tags", "problems"
309 310 add_foreign_key "problems_tags", "tags"
310 311 end
You need to be logged in to leave comments. Login now