cafe-grader-web Commit - r768:f22301d0d070

cafe-grader-web

parent | child

Description:

Merge pull request #23 from nattee/master some bug fix

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r768:f22301d0d070 - Sun, 08 Jul 2018 08:15:42 - 7 files changed: 12 inserted, 5 deleted

db/migrate/20180612102327_change_submission_source_size.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class ChangeSubmissionSourceSize < ActiveRecord::Migration
	2	+ def change
	3	+ change_column :submissions, :source, :text, :limit => 1.megabyte
	4	+ end
	5	+ end

app/controllers/problems_controller.rb ¶ +1 -1

                 end
                 def do_manage
-            -     if params.has_key? 'change_date_added'
+            +     if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest

app/controllers/report_controller.rb ¶ +1 -1

                   end
                   #users
-            -     @users = if params[:user] == "all" then
+            +     @users = if params[:users] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)

app/models/submission.rb ¶ +1 -1

                 before_validation :assign_language
                 validates_presence_of :source
-            -   validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
+            +   validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'code too long, the limit is 100,000 bytes'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language

app/views/problems/manage.html.haml ¶ +1

                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY',
                   showTodayButton: true,
+            +     locale: 'en',
                   widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
                 });

app/views/sites/edit.html.haml ¶ +1

               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY HH:mm',
+            +     locale: 'en',
                   showTodayButton: true,
                 });

db/schema.rb ¶ +2 -2

               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170914150742) do
+            + ActiveRecord::Schema.define(version: 20180612102327) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                   t.integer  "user_id",               limit: 4
                   t.integer  "problem_id",            limit: 4
                   t.integer  "language_id",           limit: 4
-            -     t.text     "source",                limit: 65535
+            +     t.text     "source",                limit: 16777215
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings