cafe-grader-web Commit - r617:f062e467ef5c

r617:f062e467ef5c - Mon, 28 Nov 2016 10:31:29 - 10 files changed: 42 inserted, 63 deleted

app/controllers/announcements_controller.rb ¶ +7 -1

                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
-            -       if @announcement.update_attributes(params[:announcement])
+            +       if @announcement.update_attributes(announcement_params)
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.js   {}
                     format.xml  { head :ok }
                   end
                 end
+            +
+            +   private
+            +
+            +     def announcement_params
+            +       params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only,:title, :note)
+            +     end
               end

app/controllers/configurations_controller.rb ¶ +6 -1

                   @config = GraderConfiguration.find(params[:id])
                   User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|
-            -       if @config.update_attributes(params[:grader_configuration])
+            +       if @config.update_attributes(configuration_params)
                       format.json { head :ok }
                     else
                       format.json { respond_with_bip(@config) }
                   end
                 end
+            + private
+            +   def configuration_params
+            +     params.require(:grader_configuration).permit(:key,:value_type,:value,:description)
+            +   end
+            +
               end

app/controllers/contests_controller.rb ¶ +7 -1

                   @contest = Contest.find(params[:id])
                   respond_to do |format|
-            -       if @contest.update_attributes(params[:contest])
+            +       if @contest.update_attributes(contests_params)
                       flash[:notice] = 'Contest was successfully updated.'
                       format.html { redirect_to(@contest) }
                       format.xml  { head :ok }
                   end
                 end
+            +   private
+            +
+            +     def contests_params
+            +       params.require(:contest).permit(:title,:enabled,:name)
+            +     end
+            +
               end

app/controllers/site_controller.rb ¶ +5

                   end
                 end
+            +   private
+            +     def site_params
+            +       params.require(:site).permit()
+            +     end
+            +
               end

app/controllers/sites_controller.rb ¶ +7 -1

                   @site.clear_start_time_if_not_started
                   respond_to do |format|
-            -       if @site.update_attributes(params[:site])
+            +       if @site.update_attributes(site_params)
                       flash[:notice] = 'Site was successfully updated.'
                       format.html { redirect_to(@site) }
                       format.xml  { head :ok }
                   end
                 end
+            +   private
+            +
+            +     def site_params
+            +       params.require(:site).permit(:name,:started,:start_time,:country_id,:password)
+            +     end
+            +
               end

app/controllers/submissions_controller.rb ¶ +1 -55

		@@ -60,61 +60,6
60	60	end
61	61	end
62	62
63		- # # GET /submissions/new
64		- # # GET /submissions/new.json
65		- # def new
66		- # @submission = Submission.new
67		- #
68		- # respond_to do \|format\|
69		- # format.html # new.html.erb
70		- # format.json { render json: @submission }
71		- # end
72		- # end
73		- #
74		- #
75		- # # POST /submissions
76		- # # POST /submissions.json
77		- # def create
78		- # @submission = Submission.new(params[:submission])
79		- #
80		- # respond_to do \|format\|
81		- # if @submission.save
82		- # format.html { redirect_to @submission, notice: 'Submission was successfully created.' }
83		- # format.json { render json: @submission, status: :created, location: @submission }
84		- # else
85		- # format.html { render action: "new" }
86		- # format.json { render json: @submission.errors, status: :unprocessable_entity }
87		- # end
88		- # end
89		- # end
90		- #
91		- # # PUT /submissions/1
92		- # # PUT /submissions/1.json
93		- # def update
94		- # @submission = Submission.find(params[:id])
95		- #
96		- # respond_to do \|format\|
97		- # if @submission.update_attributes(params[:submission])
98		- # format.html { redirect_to @submission, notice: 'Submission was successfully updated.' }
99		- # format.json { head :no_content }
100		- # else
101		- # format.html { render action: "edit" }
102		- # format.json { render json: @submission.errors, status: :unprocessable_entity }
103		- # end
104		- # end
105		- # end
106		- #
107		- # # DELETE /submissions/1
108		- # # DELETE /submissions/1.json
109		- # def destroy
110		- # @submission = Submission.find(params[:id])
111		- # @submission.destroy
112		- #
113		- # respond_to do \|format\|
114		- # format.html { redirect_to submissions_url }
115		- # format.json { head :no_content }
116		- # end
117		- # end
118	63
119	64	protected
120	65	def submission_authorization
		@@ -133,5 +78,6
133	78	unauthorized_redirect
134	79	return false
135	80	end
	81	+
136	82
137	83	end

app/controllers/user_admin_controller.rb ¶ +6 -1

                 def update
                   @user = User.find(params[:id])
-            -     if @user.update_attributes(params[:user])
+            +     if @user.update_attributes(user_params)
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     end
                   end
                 end
+            +
+            +   private
+            +     def user_params
+            +       params.require(:user).permit(:login,:full_name,:hashed_password,:salt,:alias,:email,:site_id,:country_id,:activated,:enabled,:remark,:last_ip,:section)
+            +     end
               end

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

                 validates_presence_of :login
                 validates_uniqueness_of :login
-            -   validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
+            +   validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name

config/environments/development.rb ¶ +1 -1

                 config.action_dispatch.best_standards_support = :builtin
                 # Raise exception on mass assignment protection for Active Record models
-            -   config.active_record.mass_assignment_sanitizer = :strict
+            +   # config.active_record.mass_assignment_sanitizer = :strict //DEPRICATED
                 # Log the query plan for queries taking more than this (works // DEPRICATED
                 # with SQLite, MySQL, and PostgreSQL) // DEPRICATED

config/environments/test.rb ¶ +1 -1

                 config.action_mailer.delivery_method = :test
                 # Raise exception on mass assignment protection for Active Record models
-            -   config.active_record.mass_assignment_sanitizer = :strict
+            +   #config.active_record.mass_assignment_sanitizer = :strict // DEPRICATED
                 # Print deprecation notices to the stderr
                 config.active_support.deprecation = :stderr

	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

r617:f062e467ef5c - Mon, 28 Nov 2016 10:31:29 - 10 files changed: 42 inserted, 63 deleted

Sign in to your account

Commit r617:f062e467ef5c public

Author

r617:f062e467ef5c - Mon, 28 Nov 2016 10:31:29 - 10 files changed: 42 inserted, 63 deleted

Commit `r617:f062e467ef5c` public