Changeset 5943

Timestamp:

10/06/08 09:26:16 (2 years ago)

Author:

uta

Message:

2008/10/06 sync

Files:

• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb (modified) (4 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_base.rb (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_instance_tag.rb (added)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_realtime_validator_helper.rb (modified) (2 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_helper.rb (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_login_helper.rb (added)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_tiny_mce_helper.rb (modified) (2 diffs)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_user_management_helper.rb (modified) (1 diff)

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

@@ -17 +17 @@
-        end
-        render :template => '/system/user_management/main.rhtml'
+      end
+
+      def group_confirm_name
+        judge_edit_group
+        if params[:rubricks_group_name].blank?
+          rg_id, group_name = params[:rubricks_group_edit_id], params[:rubricks_group_edit_name]
+        else
+          rg_id, group_name = nil, params[:rubricks_group_name]
+        end
+        if group_name && RubricksGroup.unique?(group_name, {:ignore_id => rg_id})
+          render_ajax_validation(true)
+        else
+          render_ajax_validation(false)
+        end
-      end
-
@@ -395 +409 @@
-        csv = RubricksLib.hl(RubricksUser::CSV_HEADERS.join(',')) + "\n"
-        RubricksUser.find(:all).each do |ru|
-effective.to_
+statu
-          CSV.generate_row(column, 15, csv)
-          rubricks_logger({:action_type => :download, :note => '[_System_UserManagement_UserExport]', :data => ru})
-        end
-Kconv::kconv(csv, Kconv::SJIS
-; charset=Shift_JIS
+RubricksLib.convert('convert_csv', csv
+
-      end
-
@@ -471 +485 @@
-                  else
-                    flash[:user_management_error] = RubricksLib.hl('[_System_AdminUser_ErrorUserImportByUserValidationWithColumn]', i, RubricksLib.hl('[_System_UserManagement_EmailPublication]'))
-                    raise ArgumentError
-                  end
-                  values[14] = values[14].downcase
-                  case values[14]
-                  when 'true', 'false'
-                  else
-                    flash[:user_management_error] = RubricksLib.hl('[_System_AdminUser_ErrorUserImportByUserValidationWithColumn]', i, RubricksLib.hl('[_System_UserManagement_Effectiveness]'))
-                    raise ArgumentError
-                  end
@@ -495 +502 @@
-                    :note               => values[12],
-                    :admin_memo         => values[13],
-                    :effective          => (values[14] == 'true') ? true : false,
-                    :use_wysiwyg        => 1,
-                  }
+                  values[14] = values[14].downcase
+                  case values[14]
+                  when RubricksUser::USER_STATUS_DISABLED
+                    ru_data[:effective]     = false
+                  when RubricksUser::USER_STATUS_LOCKED
+                    ru_data[:effective]     = true
+                    ru_data[:locked_till]   = RubricksUser::LOCK_DATE
+                  when RubricksUser::USER_STATUS_EFFECTIVE
+                    ru_data[:effective]     = true
+                    ru_data[:lock_count]    = 0
+                    ru_data[:locked_till]   = Time.now
+                    ru_data[:login_at]      = Time.now
+                  else
+                    flash[:user_management_error] = RubricksLib.hl('[_System_AdminUser_ErrorUserImportByUserValidationWithColumn]', i, RubricksLib.hl('[_System_UserManagement_Status]'))
+                    raise ArgumentError
+                  end
-                  begin
-                    case mode

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

@@ -3 +3 @@
-require_dependency 'action_view_form_tag_helper'
-require_dependency 'action_view_form_options_helper'
+require_dependency 'action_view_instance_tag'
-require_dependency 'action_view_mobile_helper'
-require_dependency 'action_view_pagination_helper'

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

@@ -281 +281 @@
-              return _box['validates_#{@validator_name}_error']('#{css_id}', element) + '#{msg_format}';
-            }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-              return _box['validates_#{@validator_name}_error']('#{css_id}', element) + '#{msg_invalid_date}';
-            }
@@ -305 +295 @@
-        min_field_id = value[:min_field_id]
-        max_field_id = value[:max_field_id]
-
-        @ok_list ||= Array.new
-        @ok_list << related_forms_refresh(:date_greater_than, [min_field_id, max_field_id])
-
-        res = <<-"EOS"
-          min_field_value = $('#{min_field_id}').value;
-          max_field_value = $('#{max_field_id}').value;
-          if(min_field_value != '' || max_field_value != ''){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            if(min_date > max_date){
-              return _box['validates_#{@validator_name}_error']('#{css_id}', element) + '#{msg}';

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

@@ -33 +33 @@
-require_dependency 'action_view_rubricks_layout_toolbar_helper'
-require_dependency 'action_view_rubricks_layout_window_helper'
+require_dependency 'action_view_rubricks_login_helper'
-require_dependency 'action_view_rubricks_preload_helper'
-require_dependency 'action_view_rubricks_user_data_helper'

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

@@ -197 +197 @@
-        options[:html][:onsubmit]   = options[:html][:onsubmit] + "if(!validate_attachable_ids('#{hl(options[:textarea_id])}')) {return false;};"
-        options[:html][:onsubmit]   = options[:html][:onsubmit] + "if(!submit_tiny_mce(this.id, '#{hl(options[:textarea_id])}', #{hl(options[:max_length])})) {rubricks.common.rubricks_message_window_open('#{hl('[_Common_ExceedMaxCharacterWysiwyg]', options[:max_length])}', 'error');return false;}; "
+        options[:html][:onsubmit]   = options[:html][:onsubmit] + (options[:html][:onsubmit_last] || '') + '; '
-        form_remote_tag(options, &block)
-      end
@@ -206 +207 @@
-          :textarea_id  => 'tiny_mce_textarea',
-        }.merge(options)
+        onsubmit_last       = options.delete(:onsubmit_last) || ''
-        options[:onsubmit]  = options[:onsubmit] + "if(!validate_attachable_ids('#{hl(options[:textarea_id])}')) {return false;};"
-        options[:onsubmit]  = options[:onsubmit] + "if(submit_tiny_mce(this.id, '#{options[:textarea_id]}', #{options[:max_length]})) {return true;} else {rubricks.common.rubricks_message_window_open('#{hl('[_Common_ExceedMaxCharacterWysiwyg]', options[:max_length])}', 'error'); return false;};"
+        options[:onsubmit]  = options[:onsubmit] + "#{onsubmit_last}; "
-        form_tag(url_for_options, options, *parameters_for_url, &block)
-      end

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

@@ -155 +155 @@
-      end
-
+      def validate_group_name(css_id, options = {})
+        value  = []
+        value << {:required => true}
+        value << {:length => '1..64'}
+        value << {:regexp => {:value => "/#{l('[_Common_GroupNameFormat]')}/", :msg => hl('[_System_AdminUser_MessageGroupNameFormat]')}}
+        unless options[:ajax].blank?
+          value << options[:ajax]
+        end
+        validate(css_id, value)
+      end
+
-      def validate_login_name(css_id, options = {})
-        len = RubricksConfig.get_ru_length_list