Changeset 4629

Timestamp:

10/01/07 13:22:31 (1 year ago)

Author:

uta

Message:

824

Files:

• rubricks_core/trunk/app/models/rubricks_user.rb (modified) (3 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb (modified) (2 diffs)

rubricks_core/trunk/app/models/rubricks_user.rb

@@ -46 +46 @@
-  class << self
-    def check_kana(ru_data, edit = false)
-
+ || ''
-      unless (edit && kana.blank?)
-        if RubricksConfig.get('site_default_language') == 'japanese'
@@ -56 +56 @@
-
-    def check_login_name(ru_data, edit = false)
-
+ || ''
-      unless (edit && login_name.blank?)
-        l_len = login_name.length
@@ -65 +65 @@
-
-    def check_raw_password(ru_data, edit = false)
-
+ || ''
-      unless (edit && raw_password.blank?)
-        p_len = raw_password.length

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb

@@ -388 +388 @@
-        options = merge_options
-        judge_show_user(options)
-ru_list = []
+csv = ''
-        RubricksUser.find(:all).each do |ru|
-
+
+
-          rubricks_logger({:action_type => :download, :note => '[_System_UserManagement_UserExport]', :data => ru})
-        end
-data = Kconv::kconv(ru_list.join("\n")
-data
+csv = Kconv::kconv(csv
+csv
-      end
-
@@ -409 +410 @@
-              data.each_with_index do |line, i|
-                line = Kconv::kconv(line, Kconv::UTF8)
-line.chomp.strip.split(','
+CSV.parse_line(line
-                if values.length == 7
-                  ru_data = {