Description:
fix problem edit page
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r590:0ef720704122 - - 2 files changed: 4 inserted, 4 deleted
| @@ -1,42 +1,42 | |||
|
|
1 | 1 | class ProblemsController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | before_filter :authenticate, :authorization |
|
|
4 | 4 | |
|
|
5 | 5 | in_place_edit_for :problem, :name |
|
|
6 | 6 | in_place_edit_for :problem, :full_name |
|
|
7 | 7 | in_place_edit_for :problem, :full_score |
|
|
8 | 8 | |
|
|
9 | 9 | def index |
|
|
10 | 10 | @problems = Problem.find(:all, :order => 'date_added DESC') |
|
|
11 | 11 | end |
|
|
12 | 12 | |
|
|
13 | 13 | # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) |
|
|
14 | 14 | verify :method => :post, :only => [ :destroy, |
|
|
15 | 15 | :create, :quick_create, |
|
|
16 | 16 | :do_manage, |
|
|
17 | 17 | :do_import, |
|
|
18 |
- |
|
|
|
18 | + ], | |
|
|
19 | 19 | :redirect_to => { :action => :index } |
|
|
20 | 20 | |
|
|
21 | 21 | def show |
|
|
22 | 22 | @problem = Problem.find(params[:id]) |
|
|
23 | 23 | end |
|
|
24 | 24 | |
|
|
25 | 25 | def new |
|
|
26 | 26 | @problem = Problem.new |
|
|
27 | 27 | @description = nil |
|
|
28 | 28 | end |
|
|
29 | 29 | |
|
|
30 | 30 | def create |
|
|
31 | 31 | @problem = Problem.new(params[:problem]) |
|
|
32 | 32 | @description = Description.new(params[:description]) |
|
|
33 | 33 | if @description.body!='' |
|
|
34 | 34 | if !@description.save |
|
|
35 | 35 | render :action => new and return |
|
|
36 | 36 | end |
|
|
37 | 37 | else |
|
|
38 | 38 | @description = nil |
|
|
39 | 39 | end |
|
|
40 | 40 | @problem.description = @description |
|
|
41 | 41 | if @problem.save |
|
|
42 | 42 | flash[:notice] = 'Problem was successfully created.' |
| @@ -50,56 +50,56 | |||
|
|
50 | 50 | @problem = Problem.new(params[:problem]) |
|
|
51 | 51 | @problem.full_name = @problem.name if @problem.full_name == '' |
|
|
52 | 52 | @problem.full_score = 100 |
|
|
53 | 53 | @problem.available = false |
|
|
54 | 54 | @problem.test_allowed = true |
|
|
55 | 55 | @problem.output_only = false |
|
|
56 | 56 | @problem.date_added = Time.new |
|
|
57 | 57 | if @problem.save |
|
|
58 | 58 | flash[:notice] = 'Problem was successfully created.' |
|
|
59 | 59 | redirect_to action: :index |
|
|
60 | 60 | else |
|
|
61 | 61 | flash[:notice] = 'Error saving problem' |
|
|
62 | 62 | redirect_to action: :index |
|
|
63 | 63 | end |
|
|
64 | 64 | end |
|
|
65 | 65 | |
|
|
66 | 66 | def edit |
|
|
67 | 67 | @problem = Problem.find(params[:id]) |
|
|
68 | 68 | @description = @problem.description |
|
|
69 | 69 | end |
|
|
70 | 70 | |
|
|
71 | 71 | def update |
|
|
72 | 72 | @problem = Problem.find(params[:id]) |
|
|
73 | 73 | @description = @problem.description |
|
|
74 |
- if @description |
|
|
|
74 | + if @description.nil? and params[:description][:body]!='' | |
|
|
75 | 75 | @description = Description.new(params[:description]) |
|
|
76 | 76 | if !@description.save |
|
|
77 | 77 | flash[:notice] = 'Error saving description' |
|
|
78 | 78 | render :action => 'edit' and return |
|
|
79 | 79 | end |
|
|
80 | 80 | @problem.description = @description |
|
|
81 |
- elsif @description |
|
|
|
81 | + elsif @description | |
|
|
82 | 82 | if !@description.update_attributes(params[:description]) |
|
|
83 | 83 | flash[:notice] = 'Error saving description' |
|
|
84 | 84 | render :action => 'edit' and return |
|
|
85 | 85 | end |
|
|
86 | 86 | end |
|
|
87 | 87 | if params[:file] and params[:file].content_type != 'application/pdf' |
|
|
88 | 88 | flash[:notice] = 'Error: Uploaded file is not PDF' |
|
|
89 | 89 | render :action => 'edit' and return |
|
|
90 | 90 | end |
|
|
91 | 91 | if @problem.update_attributes(params[:problem]) |
|
|
92 | 92 | flash[:notice] = 'Problem was successfully updated.' |
|
|
93 | 93 | unless params[:file] == nil or params[:file] == '' |
|
|
94 | 94 | flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.' |
|
|
95 | 95 | out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}" |
|
|
96 | 96 | if not FileTest.exists? out_dirname |
|
|
97 | 97 | Dir.mkdir out_dirname |
|
|
98 | 98 | end |
|
|
99 | 99 | |
|
|
100 | 100 | out_filename = "#{out_dirname}/#{@problem.name}.pdf" |
|
|
101 | 101 | if FileTest.exists? out_filename |
|
|
102 | 102 | File.delete out_filename |
|
|
103 | 103 | end |
|
|
104 | 104 | |
|
|
105 | 105 | File.open(out_filename,"wb") do |file| |
| @@ -1,9 +1,9 | |||
|
|
1 | 1 | <h1>Editing problem</h1> |
|
|
2 | 2 | |
|
|
3 |
- <%= form_ |
|
|
|
3 | + <%= form_for @problem,url:{action: 'update'},html: {multipart: true} do %> | |
|
|
4 | 4 | <%= render :partial => 'form' %> |
|
|
5 | 5 | <%= submit_tag 'Edit' %> |
|
|
6 | 6 | <% end %> |
|
|
7 | 7 | |
|
|
8 | 8 | <%= link_to 'Show', :action => 'show', :id => @problem %> | |
|
|
9 | 9 | <%= link_to 'Back', :action => 'list' %> |
You need to be logged in to leave comments.
Login now