cafe-grader-web Commit - r798:46ce575fc051

cafe-grader-web

Commit `r798:46ce575fc051` public

parent | child

Description:

better user import

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

r798:46ce575fc051 - Tue, 25 Aug 2020 17:30:55 - 6 files changed: 28 inserted, 17 deleted

app/controllers/user_admin_controller.rb ¶ +14 -4

                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   error_note = []
                   error_msg = nil
                   ok_user = []
                   lines.split("\n").each do |line|
-            -       items = line.chomp.split(',')
+            +       #split with large limit, this will cause consecutive ',' to be result in a blank
+            +       items = line.chomp.split(',',1000)
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       remark =''
                       user_alias = ''
                       added_random_password = false
-            -         if items.length >= 3 and items[2].chomp(" ").length > 0;
+            +         added_password = false
+            +         if items.length >= 3
+            +           if items[2].chomp(" ").length > 0
                           password = items[2].chomp(" ")
+            +             added_password = true
+            +           end
                       else
                         password = random_password
                         added_random_password=true;
                       end
                       if items.length>= 4 and items[3].chomp(" ").length > 0;
                         user_alias = items[3].chomp(" ")
                       else
                         user_alias = login
                       end
+            +
+            +         has_remark = false
                       if items.length>=5
                         remark = items[4].strip;
+            +           has_remark = true
                       end
                       user = User.find_by_login(login)
                       if (user)
                         user.full_name = full_name
-            -           user.password = password
+            +           user.remark = remark if has_remark
-            -           user.remark = remark
+            +           user.password = password if added_password || added_random_password
                       else
+            +           #create a random password if none are given
+            +           password = random_password unless password
                         user = User.new({:login => login,
                                          :full_name => full_name,
                                          :password => password,
                                          :password_confirmation => password,
                                          :alias => user_alias,
                                          :remark => remark})
                       end
                       user.activated = true
                       if user.save
                         if added_random_password
                           note << "'#{login}' (+)"

app/helpers/application_helper.rb ¶ -3

                   end
                   contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
-            - #{user.full_name}<br/>
-            - #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
-            - #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)

app/helpers/main_helper.rb ¶ +3 -9

               module MainHelper
-            -   def link_to_description_if_any(name, problem, options={})
+            +   def link_to_description_if_any(name, problem)
                   if !problem.url.blank?
-            -       return link_to name, problem.url, options
+            +       return link_to name, problem.url
                   elsif !problem.description_filename.blank?
-            -       #build a link to a problem (via task controller)
                     basename, ext = problem.description_filename.split('.')
-            -       options[:controller] = 'tasks'
+            +       return link_to name, download_task_path(problem.id,basename,ext), target: '_blank'
-            -       options[:action] = 'download'
-            -       options[:id] = problem.id
-            -       options[:file] = basename
-            -       options[:ext] = ext
-            -       return link_to name, options
                   else
                     return ''
                   end
                 end
               end

app/views/submissions/show.html.haml ¶ +1

                           - if @submission.user
                             = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                             = @submission.user.full_name
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Task
                         %td
                           - if @submission.problem!=nil
                             = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
                             = @submission.problem.full_name
+            +               = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @submission.problem
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Tries
                         %td= @submission.number
                       %tr
                         %td.text-right
                           %strong Language
                         %td= @submission.language.pretty_name
                       %tr
                         %td.text-right

app/views/user_admin/new_list.html.haml ¶ +9

                             %tt passwd, alias
                             and
                             %tt remark
                             is optional.
                           %li
                             When
                             %tt passwd
                             or
                             %tt alias
                             is empty, the original value will be used instead.
                           %li
                             If the users with the same user_id already exists, existing information will be overwritten.
+            +           Example:
+            +           %ol
+            +             %li
+            +               %pre user1,Somchai Jaidee
+            +               will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password.
+            +             %li
+            +               %pre user1,Somchai Jaidee,
+            +               will create (or update) a user with login "user1" and and setting the fullname "Somchai Jaidee". No change is made to the password unless this is a new user. If this is a new user, a random password will be generated.
+            +
                 .row
                   .col-md-6
                     = form_tag :action => 'create_from_list' do
                       .form-group
                         = submit_tag 'Create following users',class: 'btn btn-success'
                       .form-group
                         .div.checkbox
                           %label
                             = check_box_tag :add_to_group
                             Also add these users to the following group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'

config/routes.rb ¶ +1 -1

                   get 'help'
                   post 'submit'
                 end
                 #main
                 #get "main/list"
                 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #post 'main/submit', to: 'main#submit'
                 #get 'main/announcements', to: 'main#announcements'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
-            -   get 'tasks/download/:id/:file.:ext' => 'tasks#download'
+            +   get 'tasks/download/:id/:file.:ext' => 'tasks#download', as: 'download_task'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
                 namespace :graders do
                   get 'task/:id/:type', action: 'task', as: 'task'
                   get 'view/:id/:type', action: 'view', as: 'view'
                   get 'clear/:id', action: 'clear', as: 'clear'
                   get 'stop'
                   get 'stop_all'
                   get 'clear_all'
                   get 'clear_terminated'

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

r798:46ce575fc051 - Tue, 25 Aug 2020 17:30:55 - 6 files changed: 28 inserted, 17 deleted

Sign in to your account

Commit r798:46ce575fc051 public

Author

r798:46ce575fc051 - Tue, 25 Aug 2020 17:30:55 - 6 files changed: 28 inserted, 17 deleted

Commit `r798:46ce575fc051` public