Navigation

← Previous Changeset
Next Changeset →

Changeset 5848

Timestamp:

07/15/08 09:04:24 (4 months ago)

Author:

uta

Message:

2008/07/15 sync

Files:

rubricks_core/trunk/app/models/rubricks_trail.rb (modified) (1 diff)
rubricks_core/trunk/components/system/account_controller.rb (modified) (3 diffs)
rubricks_core/trunk/components/system/admin_config_controller.rb (modified) (2 diffs)
rubricks_core/trunk/components/system/calendar/show.rhtml (modified) (1 diff)
rubricks_core/trunk/components/system/languages/english.rb (modified) (1 diff)
rubricks_core/trunk/components/system/languages/japanese.rb (modified) (2 diffs)
rubricks_core/trunk/components/system/login/_change_password_form.rhtml (modified) (1 diff)
rubricks_core/trunk/components/system/login/_reissue_password_form.rhtml (modified) (1 diff)
rubricks_core/trunk/vendor/plugins/rubricks/lib/action_controller_user_management.rb (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

rubricks_core/trunk/app/models/rubricks_trail.rb

r5759	r5848
75	75	end
76	76	if filter_conditions[:trails_user_name].blank?
77		queries << 'user_login_name != ?'
78		conditions << ''
	77	queries << 'user_login_name is not null'
79	78	else
80	79	queries << 'user_login_name = ?'

rubricks_core/trunk/components/system/account_controller.rb

r5820	r5848
136	136	ru.ignore_csrf_validation = true
137	137	ru.save!
138		rubricks_logger({:action_type => :update, :component_name => 'auth', :component_display_name => '[_Common_Authentication]', :data => ru})
	138	rubricks_logger({:action_type => :update, :component_name => 'auth', :component_display_name => '[_Common_Authentication]', :note => '[_System_Account_ReissuePassword]', :data => ru})
139	139	end
140	140	flash[:login_message] = RubricksLib.hl('[_System_Account_MessageReissue]') + RubricksLib.get_password_messages
…	…
239	239	def user_image_delete
240	240	options = merge_options
241		ru_id = current_user.id
242		begin
243		ActiveRecord::Base.transaction do
244		RubricksUserImage.destroy_all(['rubricks_user_id = ?', ru_id])
245		@detail = simple_render_component_as_string('/org/index', 'user_show', {:id => ru_id})
246		end
	241	@ru = current_user
	242	begin
	243	ActiveRecord::Base.transaction do
	244	RubricksUserImage.destroy_all(['rubricks_user_id = ?', @ru.id])
	245	@detail = simple_render_component_as_string('/org/index', 'user_show', {:id => @ru.id})
	246	end
	247	rubricks_logger({:action_type => :delete, :note => '[_System_UserManagement_UserImageDelete]', :data => @ru})
247	248	flash[:user_management_message] = options[:msg_user_image_delete]
248	249	rescue Exception => ex
…	…
260	261	RubricksUserImage.save_file(params[:user_image_upload][:file], {:user => @ru})
261	262	end
	263	rubricks_logger({:action_type => :upload, :note => '[_System_UserManagement_UserImageUpload]', :data => @ru})
262	264	flash[:user_management_message] = options[:msg_user_image_upload]
263	265	rescue Exception => ex

rubricks_core/trunk/components/system/admin_config_controller.rb

r5781	r5848
25	25	rch_list = params[:holidays].json2ruby.map do \|d\|
26	26	date = Date::new(d['year'].to_i, d['month'].to_i, d['day'].to_i)
27		rch = RubricksCalendarHoliday.find_by_date(date)
28		rch.destroy unless rch.nil?
	27	RubricksCalendarHoliday.find_by_date(date)
29	28	end
	29	rch_list.compact!
30	30	@holidays = rch_list.to_json
31	31	rubricks_logger({:action_type => :delete, :note => '[_System_AdminConfig_TabHoliday]', :data => rch_list})
	32	RubricksCalendarHoliday.destroy_all(['id in (?)', rch_list.map{\|rch\| rch.id}])
32	33	end
33	34	end
…	…
83	84	begin
84	85	ActiveRecord::Base.transaction do
85		rubricks_logger({:action_type => :delete, :note => '[_System_AdminConfig_~~TabHoliday~~]'})
	86	rubricks_logger({:action_type => :delete, :note => '[_System_AdminConfig_MessageHolidayInitialize]'})
86	87	RubricksCalendarHoliday.destroy_all
87	88	end

rubricks_core/trunk/components/system/calendar/show.rhtml

r5056	r5848
1	1	<script type="text/javascript">
2	2	if ($('calendar_block')) {
3		rubricks.system.calendar.show_detail_calendar = true;
4		rubricks.system.calendar.calendarBlock = new Calendar(
5		'calendar_block',
6		{
7		size: 'small',
8		holidays: <%= @holidays.to_json %>,
9		schedules: <%= @schedules.to_json %>,
10		initDate: new Date(<%= hl(@today.year) %>, <%= hl(@today.month - 1) %>, <%= hl(@today.day) %>),
11		cssPrefix: 'custom_block_',
12		changeCalendar: rubricks.common.CalendarComponent.changeCalendar('rubricks.system.calendar.calendarBlock', '<%= url_for(:controller => '/system/calendar', :action => 'change_calendar') %>'),
13		monthHeaderFormat: '<%= hl('[_Common_YearMonth_Format_String]') %>',
14		dayOfWeek: [
15		'<%= hl('[_Common_Sunday]') %>',
16		'<%= hl('[_Common_Monday]') %>',
17		'<%= hl('[_Common_Tuesday]') %>',
18		'<%= hl('[_Common_Wednesday]') %>',
19		'<%= hl('[_Common_Thursday]') %>',
20		'<%= hl('[_Common_Friday]') %>',
21		'<%= hl('[_Common_Saturday]') %>',
22		],
23		afterSelect: function(date, calendar) {
24		if (!rubricks.system.calendar.show_detail_calendar) return;
25		var params = {year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()};
26		new Ajax.Updater(
27		'system_calendar_container',
28		'<%= url_for(:controller => '/system/calendar', :action => 'show_detail') %>',
29		{
30		asynchronous: true,
31		evalScripts: true,
32		onLoaded: function() { rubricks.common.rubricks_wait_message_close() },
33		onLoading: function() { rubricks.common.rubricks_wait_message_open() },
34		onSuccess: function() { rubricks.system.calendar.calendar_window.center(); rubricks.system.calendar.calendar_window.open(); },
35		parameters: params
36		}
37		);
	3	(function() {
	4	rubricks.system.calendar.show_detail_calendar = true;
	5	rubricks.system.calendar.calendarBlock = new Calendar(
	6	'calendar_block',
	7	{
	8	size: 'small',
	9	holidays: <%= @holidays.to_json %>,
	10	schedules: <%= @schedules.to_json %>,
	11	initDate: new Date(<%= hl(@today.year) %>, <%= hl(@today.month - 1) %>, <%= hl(@today.day) %>),
	12	cssPrefix: 'custom_block_',
	13	changeCalendar: rubricks.common.CalendarComponent.changeCalendar('rubricks.system.calendar.calendarBlock', '<%= url_for(:controller => '/system/calendar', :action => 'change_calendar') %>'),
	14	monthHeaderFormat: '<%= hl('[_Common_YearMonth_Format_String]') %>',
	15	dayOfWeek: [
	16	'<%= hl('[_Common_Sunday]') %>',
	17	'<%= hl('[_Common_Monday]') %>',
	18	'<%= hl('[_Common_Tuesday]') %>',
	19	'<%= hl('[_Common_Wednesday]') %>',
	20	'<%= hl('[_Common_Thursday]') %>',
	21	'<%= hl('[_Common_Friday]') %>',
	22	'<%= hl('[_Common_Saturday]') %>'
	23	],
	24	afterSelect: function(date, calendar) {
	25	if (!rubricks.system.calendar.show_detail_calendar) return;
	26	var params = {year: date.getFullYear(), month: date.getMonth() + 1, day: date.getDate()};
	27	new Ajax.Updater(
	28	'system_calendar_container',
	29	'<%= url_for(:controller => '/system/calendar', :action => 'show_detail') %>',
	30	{
	31	asynchronous: true,
	32	evalScripts: true,
	33	onLoaded: function() { rubricks.common.rubricks_wait_message_close() },
	34	onLoading: function() { rubricks.common.rubricks_wait_message_open() },
	35	onSuccess: function() { rubricks.system.calendar.calendar_window.center(); rubricks.system.calendar.calendar_window.open(); },
	36	parameters: params
	37	}
	38	);
	39	}
38	40	}
39		}
40		);
	41	);
	42	}).callAfterLoading();
41	43	}
42	44	</script>

rubricks_core/trunk/components/system/languages/english.rb

r5820	r5848
459	459	'_System_UserManagement_UserCreate' => 'User Create',
460	460	'_System_UserManagement_UserExport' => 'User Export',
	461	'_System_UserManagement_UserImageDelete' => 'User Image Delete',
	462	'_System_UserManagement_UserImageUpload' => 'User Image Upload',
461	463	'_System_UserManagement_UserImport' => 'User Import',
462	464	'_System_UserManagement_UserInvalidate' => 'User Invalidate',

rubricks_core/trunk/components/system/languages/japanese.rb

r5834	r5848
498	498	'_System_Login_PasswordConfirm' => '[ç¢ºèªå
499	499	¥å]',
500		'_System_Login_PasswordNew' => 'æ°ã~~ãã~~ã¹ã¯ãŒã',
	500	'_System_Login_PasswordNew' => 'æ°ãã¹ã¯ãŒã',
501	501	'_System_Login_Success' => 'ãã°ã€ã³æå',
502	502	'_System_Menu_Rubricks' => 'Rubricks',
…	…
578	578	'_System_UserManagement_UserExport' => 'ãŠãŒã¶æ
579	579	å ±ãšã¯ã¹ããŒã',
	580	'_System_UserManagement_UserImageDelete' => 'ãŠãŒã¶ç»ååé€',
	581	'_System_UserManagement_UserImageUpload' => 'ãŠãŒã¶ç»åã¢ããããŒã',
580	582	'_System_UserManagement_UserImport' => 'ãŠãŒã¶æ
581	583	å ±ã€ã³ããŒã',

rubricks_core/trunk/components/system/login/_change_password_form.rhtml

r5781	r5848
2	2	<div class="rubricks_login_form">
3	3	<dl>
4		<dt style="width:120px;"><%= hl('[_System_Login_PasswordNew]') %></dt>
5		<dd><%= password_field 'change_password', 'raw_password', :size => 16, :class => 'input_text_inactive focus' %></dd>
6		<dt style="width:120px;"><%= hl('[_System_Login_PasswordConfirm]') %></dt>
7		<dd><%= password_field 'change_password', 'raw_password_confirm', :size => 16, :class => 'input_text_inactive focus' %></dd>
	4	<dt style="width:90px;"><%= hl('[_System_Login_PasswordNew]') %></dt>
	5	<dd style="margin-left:90px;"><%= password_field 'change_password', 'raw_password', :size => 16, :class => 'input_text_inactive focus' %></dd>
	6	<dt style="width:90px;"><%= hl('[_System_Login_PasswordConfirm]') %></dt>
	7	<dd style="margin-left:90px;"><%= password_field 'change_password', 'raw_password_confirm', :size => 16, :class => 'input_text_inactive focus' %></dd>
8	8	</dl>
9	9	<div class="rubricks_layout_buttons">

rubricks_core/trunk/components/system/login/_reissue_password_form.rhtml

r5781	r5848
3	3	<dl>
4	4	<dt style="width:120px;"><%= hl('[_System_Account_ReissueMail]') %></dt>
5		<dd><%= text_field 'reissue', 'email', :size => 16, :class => 'input_text_inactive focus' %></dd>
	5	<dd style="margin-left:120px;"><%= text_field 'reissue', 'email', :size => 16, :class => 'input_text_inactive focus' %></dd>
6	6	</dl>
7	7	<div class="rubricks_layout_buttons">

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

r5819	r5848
424	424	begin
425	425	ActiveRecord::Base.transaction do
426		RubricksUserImage.destroy_all(['rubricks_user_id = ?', params[:id].to_i])
427		@detail = simple_render_component_as_string(params[:controller].sub(%r(^/?), '/'), 'user_show', {:id => params[:id]})
428		end
	426	@ru = RubricksUser.find(params[:id])
	427	RubricksUserImage.destroy_all(['rubricks_user_id = ?', @ru.id])
	428	@detail = simple_render_component_as_string(params[:controller].sub(%r(^/?), '/'), 'user_show', {:id => @ru.id})
	429	end
	430	rubricks_logger({:action_type => :delete, :note => '[_System_UserManagement_UserImageDelete]', :data => @ru})
429	431	flash[:user_management_message] = options[:msg_user_image_delete]
430	432	rescue Exception => ex
…	…
443	445	RubricksUserImage.save_file(params[:user_image_upload][:file], {:user => @ru})
444	446	end
	447	rubricks_logger({:action_type => :upload, :note => '[_System_UserManagement_UserImageUpload]', :data => @ru})
445	448	flash[:user_management_message] = options[:msg_user_image_upload]
446	449	rescue Exception => ex

Navigation

Changeset 5848

Legend:

Download in other formats: