cafe-grader-web

Commit r136:877c184d2b5d public

parent | child
Description:
fixed userlist-add inconsistency git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@272 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r136:877c184d2b5d - - 2 files changed: 12 inserted, 7 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -15,56 +15,56
15 @users = User.find(:all)
15 @users = User.find(:all)
16 end
16 end
17
17
18 def show
18 def show
19 @user = User.find(params[:id])
19 @user = User.find(params[:id])
20 end
20 end
21
21
22 def new
22 def new
23 @user = User.new
23 @user = User.new
24 end
24 end
25
25
26 def create
26 def create
27 @user = User.new(params[:user])
27 @user = User.new(params[:user])
28 if @user.save
28 if @user.save
29 flash[:notice] = 'User was successfully created.'
29 flash[:notice] = 'User was successfully created.'
30 redirect_to :action => 'list'
30 redirect_to :action => 'list'
31 else
31 else
32 render :action => 'new'
32 render :action => 'new'
33 end
33 end
34 end
34 end
35
35
36 def create_from_list
36 def create_from_list
37 lines = params[:user_list]
37 lines = params[:user_list]
38 lines.split("\n").each do |line|
38 lines.split("\n").each do |line|
39 - items = line.split
39 + items = line.split(',')
40 - if items.length==5
40 + if items.length==4
41 user = User.new
41 user = User.new
42 user.login = items[0]
42 user.login = items[0]
43 - user.full_name = "#{items[1]} #{items[2]}"
43 + user.full_name = items[1]
44 - user.alias = items[3]
44 + user.alias = items[2]
45 - user.password = items[4]
45 + user.password = items[3]
46 - user.password_confirmation = items[4]
46 + user.password_confirmation = items[3]
47 user.save
47 user.save
48 end
48 end
49 end
49 end
50 redirect_to :action => 'list'
50 redirect_to :action => 'list'
51 end
51 end
52
52
53 def edit
53 def edit
54 @user = User.find(params[:id])
54 @user = User.find(params[:id])
55 end
55 end
56
56
57 def update
57 def update
58 @user = User.find(params[:id])
58 @user = User.find(params[:id])
59 if @user.update_attributes(params[:user])
59 if @user.update_attributes(params[:user])
60 flash[:notice] = 'User was successfully updated.'
60 flash[:notice] = 'User was successfully updated.'
61 redirect_to :action => 'show', :id => @user
61 redirect_to :action => 'show', :id => @user
62 else
62 else
63 render :action => 'edit'
63 render :action => 'edit'
64 end
64 end
65 end
65 end
66
66
67 def destroy
67 def destroy
68 User.find(params[:id]).destroy
68 User.find(params[:id]).destroy
69 redirect_to :action => 'list'
69 redirect_to :action => 'list'
70 end
70 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,2 +1,7
1 - require 'haml'
1 + begin
2 + require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
3 + rescue LoadError
4 + require 'haml' # From gem
5 + end
6 +
2 Haml.init_rails(binding)
7 Haml.init_rails(binding)
You need to be logged in to leave comments. Login now