# HG changeset patch
# User jittat <jittat@6386c4cd-e34a-4fa8-8920-d93eb39b512e>
# Date 2008-08-14 10:44:30
# Node ID 877c184d2b5dd702e73e4bb8770a16b94f1e319e
# Parent  f6a12467cbf150b24d398e33741e34a6cf3bc2b0

fixed userlist-add inconsistency

git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@272 6386c4cd-e34a-4fa8-8920-d93eb39b512e

diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb
--- a/app/controllers/user_admin_controller.rb
+++ b/app/controllers/user_admin_controller.rb
@@ -36,14 +36,14 @@
   def create_from_list
     lines = params[:user_list]
     lines.split("\n").each do |line|
-      items = line.split
-      if items.length==5
+      items = line.split(',')
+      if items.length==4
         user = User.new
         user.login = items[0]
-        user.full_name = "#{items[1]} #{items[2]}"
-        user.alias = items[3]
-        user.password = items[4]
-        user.password_confirmation = items[4]
+        user.full_name = items[1]
+        user.alias = items[2]
+        user.password = items[3]
+        user.password_confirmation = items[3]
         user.save
       end
     end
diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb
--- a/vendor/plugins/haml/init.rb
+++ b/vendor/plugins/haml/init.rb
@@ -1,2 +1,7 @@
-require 'haml'
+begin
+  require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
+rescue LoadError
+  require 'haml' # From gem
+end
+
 Haml.init_rails(binding)