cafe-grader-web Commit - r753:9918c6e0c313

cafe-grader-web

parent | child

Description:

still upgrading

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r753:9918c6e0c313 - Fri, 05 Jul 2019 11:10:19 - 6 files changed: 26 inserted, 17 deleted

app/controllers/problems_controller.rb ¶ +6 -2

                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description.nil? and params[:description][:body]!=''
-            -       @description = Description.new(params[:description])
+            +       @description = Description.new(description_params)
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description
-            -       if !@description.update_attributes(params[:description])
+            +       if !@description.update_attributes(description_params)
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     params.require(:problem).permit(:name, :full_name, :full_score, :change_date_added, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
+            +     def description_params
+            +       params.require(:description).permit(:body, :markdown)
+            +     end
+            +
               end

app/models/user.rb ¶ +2 -2

                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests, -> { order(:name); uniq}
+            +   has_and_belongs_to_many :contests, -> { order(:name)}
                 scope :activated_users, -> {where activated: true}
                     return false if site==nil
                     return site.finished?
                   elsif GraderConfiguration.indv_contest_mode?
-            -       return false if self.contest_stat(true)==nil
+            +       return false if self.contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false

app/views/problems/import.html.haml ¶ +2 -1

               - if @problem and @problem.errors
                 =error_messages_for 'problem'
-            - = form_tag({:action => 'do_import'}, :multipart => true)  do
+            + = simple_form_for :problem, url: do_import_problems_path, :multipart => true  do |f|
+            +
                 .submitbox
                   %table
                     %tr

app/views/report/max_score.html.haml ¶ +1 -1

               %h1 Maximum score
-            - = form_tag report_show_max_score_path
+            + = form_tag show_max_score_report_path
               .row
                 .col-md-4
                   .panel.panel-primary

app/views/submissions/edit.html.haml ¶ +12 -11

@@ -51,17 +51,18
51	%h2 Console	51	%h2 Console
52	%textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}	52	%textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
53		53
54	- .modal.fade#compiler{tabindex: -1,role: 'dialog'}	54	+ - if @submission
55	- .modal-dialog.modal-lg{role:'document'}	55	+ .modal.fade#compiler{tabindex: -1,role: 'dialog'}
56	- .modal-content	56	+ .modal-dialog.modal-lg{role:'document'}
57	- .modal-~~header~~	57	+ .modal-content
58	- %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}	58	+ .modal-header
59	- %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×	59	+ %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
60	- %h4 Compiler message	60	+ %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×
61	- .modal-body	61	+ %h4 Compiler message
62	- %pre#compiler_msg= @submission.compiler_message	62	+ .modal-body
63	- .modal-footer	63	+ %pre#compiler_msg= @submission.compiler_message
64	- %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close	64	+ .modal-footer
		65	+ %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
65		66
66	:javascript	67	:javascript
67	$(document).ready(function() {	68	$(document).ready(function() {

config/routes.rb ¶ +3

                     get 'manage'
                     get 'quick_create'
                     post 'do_manage'
+            +       post 'do_import'
                   end
                 end
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
+            +       get 'source'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'user_stat'
                     get 'clear_stat'
                     get 'clear_all_stat'
+            +       get 'change_contest_mode'
                   end
                 end

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