Skip to content

Commit

Permalink
More svn removal changes
Browse files Browse the repository at this point in the history
  • Loading branch information
evanyeyeye committed Feb 5, 2024
1 parent 084f29a commit a1895e7
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 47 deletions.
10 changes: 1 addition & 9 deletions app/controllers/assessments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ class AssessmentsController < ApplicationController
action_no_auth :log_submit
action_no_auth :local_submit

# SVN
autolab_require Rails.root.join("app/controllers/assessment/svn.rb")
include AssessmentSVN
action_auth_level :admin_svn, :instructor
action_auth_level :set_repo, :instructor
action_auth_level :import_svn, :instructor

def index
@is_instructor = @cud.has_auth_level? :instructor
announcements_tmp = Announcement.where("start_date < :now AND end_date > :now",
Expand Down Expand Up @@ -1017,8 +1010,7 @@ def releaseMatchingGrades
def new_assessment_params
ass = params.require(:assessment)
ass[:category_name] = params[:new_category] if params[:new_category].present?
ass.permit(:name, :display_name, :category_name, :has_svn, :has_lang, :group_size,
:github_submission_enabled)
ass.permit(:name, :display_name, :category_name, :group_size, :github_submission_enabled)
end

def edit_assessment_params
Expand Down
2 changes: 1 addition & 1 deletion app/models/assessment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ def serialize
end

GENERAL_SERIALIZABLE = Set.new %w[display_name category_name description handin_filename
handin_directory has_svn has_lang max_grace_days handout
handin_directory max_grace_days handout
writeup max_submissions disable_handins max_size
version_threshold is_positive_grading embedded_quiz group_size
github_submission_enabled allow_student_assign_group
Expand Down
33 changes: 1 addition & 32 deletions app/views/assessments/_handin_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,7 @@

<div class="row">
<div class="col s12">
<% if @assessment.has_svn then %>
<%= form_for @submission, url: { action: :handin },
html: { name: "submissionForm", onclick: "return validateIntegrity();" },
method: :post do |f| %>

<!-- Academic integrity checkbox -->
<%= label_tag(:integrity_checkbox) do %>
<%= check_box_tag(:integrity_checkbox) %>
<%= content_tag("span", "I affirm that I have complied with this course's academic integrity
policy as defined in the syllabus#{late_confirm}.") %>
<% end %>

<% if @aud.past_due_at? then %>
<table style="width:100%">
<td>
<%= f.submit("Checkout Repository", class: "btn primary handin-btn",
data: { confirm: "Are you sure you want to submit late?" },
onclick: "setSubmitClicked()") %>
</td>
<td id="submission_error" style="color:red"></td>
</table>
<% else %>
<table style="width:100%">
<td>
<%= f.submit("Checkout Repository", class: "btn primary handin-btn",
onclick: "setSubmitClicked()") %>
</td>
<td id="submission_error" style="color:red"></td>
</table>
<% end %>
<% end %>
<% elsif ! @assessment.disable_handins? and !@assessment.embedded_quiz then %>
<% if !@assessment.disable_handins? and !@assessment.embedded_quiz then %>
<%= form_for @submission, url: { action: :handin },
html: { name: "submissionForm", onclick: "return validateIntegrity();" },
multipart: true do |f| %>
Expand Down
5 changes: 0 additions & 5 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,6 @@
post "regradeBatch"
post "regradeAll"

# SVN actions
get "admin_svn"
post "import_svn"
post "set_repo"

# gradesheet ajax actions
post "quickSetScore"
post "quickSetScoreDetails"
Expand Down

0 comments on commit a1895e7

Please sign in to comment.