Changeset 5723

Show
Ignore:
Timestamp:
03/26/08 08:54:31 (8 months ago)
Author:
uta
Message:

2008/03/26 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • rubricks_core/trunk/components/system/account/_user_show_print_content.rhtml

    r5695 r5723  
    77        <%= user_image_tag(@ru) %> 
    88      </div> 
    9       <% if my_user?(@ru) && (flg_print.blank? rescue true) %> 
     9      <% if my_user?(@ru) && !print? && user_profile_editable? %> 
    1010        <% render_float_button('rubricks_user_image_fba') do %> 
    1111          <% unless @ru.rubricks_user_image.blank? %> 

  • rubricks_core/trunk/components/system/account_controller.rb

    r5603 r5723  
    122122      judge_edit_user(@options) unless @ru.effective 
    123123      @editable_ru_columns  = RubricksConfig.get_editable_ru_columns 
    124       render :partial => '/system/account/user_show_print_content', :locals => {:flg_print => true} 
     124      render :partial => '/system/account/user_show_print_content' 
    125125    else 
    126126      render :nothing => true 

  • rubricks_core/trunk/components/system/preload/_preload.rhtml

    r5250 r5723  
    1616<%= load_system_component_js %> 
    1717<%= stylesheet_link_tag '/stylesheets/components/system/style' %> 
     18<%= render_preload_partial :user_detail_window %> 

  • rubricks_core/trunk/components/system/preload/_user.rhtml

    r5524 r5723  
    11rubricks.system.user = { 
    2   group_select: {}, 
    3   msg_difference_login_name_and_password: "<%= hl('[_System_User_ValidateDifferenceLoginNameAndPassword]') %>", 
    4   user_select: {} 
     2  group_select:                            {}, 
     3  msg_difference_login_name_and_password:  '<%= jl('[_System_User_ValidateDifferenceLoginNameAndPassword]') %>', 
     4  url_user_detail_window:                  '<%= url_for(:controller => '/system/account', :action => 'user_detail_window') %>', 
     5  user_select:                             {} 
    56}; 

  • rubricks_core/trunk/components/system/user_management/_group_show_tab_permission_info_print_content.rhtml

    r5695 r5723  
    1111    <% component[:functions].each_with_index do |function, i| %> 
    1212      <tr class="<%= tr_class %>"> 
    13         <% if @print && firefox? %> 
     13        <% if print? && firefox? %> 
    1414          <td><%= (i == 0) ? hl(component[:name]) : '' %></td> 
    1515        <% else %> 

  • rubricks_core/trunk/components/system/user_management/_group_show_tab_user_belongs_to_print_content.rhtml

    r5441 r5723  
    11<div id="users_belongs_to_frame"> 
    22  <%#todo %> 
    3   <%# simple_render_component(params[:controller].sub(%r(^/?), '/'), 'group_show_user_list', {:id => @rg.id.to_s, :page => @page, :print => ((@print.blank?) ? nil : true)}) %> 
    4   <%= simple_render_component(params[:controller].sub(%r(^/?), '/'), 'group_show_user_list', {:id => @rg.id.to_s, 'page' => @page, :print => ((@print.blank?) ? nil : true)}) %> 
     3  <%# simple_render_component(params[:controller].sub(%r(^/?), '/'), 'group_show_user_list', {:id => @rg.id.to_s, :page => @page}) %> 
     4  <%= simple_render_component(params[:controller].sub(%r(^/?), '/'), 'group_show_user_list', {:id => @rg.id.to_s, 'page' => @page}) %> 
    55</div> 

  • rubricks_core/trunk/components/system/user_management/_user_show_print_content.rhtml

    r5695 r5723  
    77        <%= user_image_tag(@ru) %> 
    88      </div> 
    9       <% if @options[:flg_edit_user] && (flg_print.blank? rescue true) %> 
     9      <% if @options[:flg_edit_user] && !print? && user_profile_editable? %> 
    1010        <% render_float_button('rubricks_user_image_fba') do %> 
    1111          <% unless @ru.rubricks_user_image.blank? %> 

  • rubricks_core/trunk/components/system/user_management/group_show_user_list.rhtml

    r5674 r5723  
    66  <%= pagination_remote_links(@pages, {:params => {:update => 'users_belongs_to_frame', :url => {:controller => params[:controller].sub(%r(^/?), '/'), :action => 'group_show_user_list', :id => @id}}, :window_size => 5}, {:id => 'users_belongs_to_navigation_top'}) %> 
    77  <table id="group_show_users_belongs_to" class="rubricks_general_table"> 
    8     <%= render_users(@users_belongs_to, {:with_detail => @print.nil?, :with_status => true}) %> 
     8    <%= render_users(@users_belongs_to) %> 
    99  </table> 
    1010  <%= pagination_remote_links(@pages, {:params => {:update => 'users_belongs_to_frame', :url => {:controller => params[:controller].sub(%r(^/?), '/'), :action => 'group_show_user_list', :id => @id}}, :window_size => 5}, {:id => 'users_belongs_to_navigation_bottom'}) %> 
    11   <% if @print.nil? %> 
     11  <% unless print? %> 
    1212    <script type="text/javascript"> 
    1313      rubricks.system.admin_user.functions.print_target_set('group_user_belongs_to', '<%= hl(@id) %>', '<%= hl(@pages.current_page.number) %>'); 

  • rubricks_core/trunk/components/system/user_management/main.rhtml

    r5695 r5723  
    100100  <% end %> 
    101101</div> 
    102 <% if @options[:flg_show_user] %> 
    103   <%= render :partial => '/system/user_management/main_user_detail_window' %> 
    104 <% end %> 
    105102<% if @options[:flg_edit_user] %> 
    106103  <%= render :partial => '/system/user_management/main_user_create_window' %> 

  • rubricks_core/trunk/components/system/user_management/print_control.rhtml

    r5443 r5723  
    1818  <%= hl(@title) %> 
    1919  <% @partial_list.each do |partial| %> 
    20     <%= render :partial => partial, :locals => {:flg_print => true} %> 
     20    <%= render :partial => partial %> 
    2121  <% end %> 
    2222<% end %> 

  • rubricks_core/trunk/components/system/user_management/user_detail_window.rhtml

    r5610 r5723  
    1 <%= render :partial => @options[:user_detail_partial], :locals => {:flg_print => true} %> 
     1<%= render :partial => @options[:user_detail_partial] %> 
    22<% form_tag({:controller => '/'}, {:class => 'rubricks_layout_buttons'}) do %> 
    3   <input type="button" id="user_detail_window_close_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Close]') %>" onclick="rubricks.system.admin_user.functions.user_detail_window_close();" /> 
     3  <input type="button" id="user_detail_window_close_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Close]') %>" onclick="rubricks.system.user.detail_window_close();" /> 
    44<% end %> 
    55<%= rollover_swap('user_detail_window_close_button') %> 
    66<script type="text/javascript"> 
    7   rubricks.system.admin_user.functions.user_detail_window_open(); 
     7  rubricks.system.user.detail_window_open(); 
    88  rubricks.common.rubricks_wait_message_close(); 
    99  $('user_detail_window_close_button').focus(); 

  • rubricks_core/trunk/components/system/user_management/user_list.rhtml

    r5674 r5723  
    1313        <% render_selectable_tr(ru.id) do %> 
    1414          <% render_selectable_td do %> 
    15             <%= render_user_info(ru, {:with_status => true}) %> 
     15            <%= render_user_info(ru, {:with_detail => false}) %> 
    1616          <% end %> 
    1717        <% end %> 

  • rubricks_core/trunk/public/javascripts/components/system/src_system_user.js

    r5524 r5723  
    11Object.extend(rubricks.system.user, { 
     2  detail_window_close: function() { 
     3    this.detail_window.close(); 
     4  }, 
     5  detail_window_open: function() { 
     6    this.detail_window.center(); 
     7    this.detail_window.open(); 
     8  }, 
     9  user_detail_window_render: function(ru_id) { 
     10    new Ajax.Updater( 
     11      'user_detail_window_contents', 
     12      rubricks.system.user.url_user_detail_window, 
     13      { 
     14        asynchronous:   true, 
     15        evalScripts:    true, 
     16        parameters:     {id:ru_id}, 
     17        onLoading:      function(request){rubricks.common.rubricks_wait_message_open();} 
     18      } 
     19    ); 
     20  }, 
    221  validate_difference_login_name_and_password: function(self_element, target_element) { 
    322    if($(self_element).value == $(target_element).value) { 

  • rubricks_core/trunk/public/javascripts/components/system/src_system_user_management.js

    r5645 r5723  
    433433    ); 
    434434  }, 
    435   user_detail_window_close: function() { 
    436     rubricks.system.admin_user.variables.user_detail_window.close(); 
    437   }, 
    438   user_detail_window_open: function(ru_id) { 
    439     var variables = rubricks.system.admin_user.variables 
    440     variables.user_detail_window.center(); 
    441     variables.user_detail_window.open(); 
    442   }, 
    443435  user_detail_window_render: function(ru_id) { 
    444436    new Ajax.Updater( 

  • rubricks_core/trunk/public/javascripts/components/system/system.js

    r5707 r5723  
    999999},"rubricks_system_search_select"); 
    10001000 
    1001 Object.extend(rubricks.system.user,{validate_difference_login_name_and_password:function(_1,_2){ 
    1002 if($(_1).value==$(_2).value){ 
     1001Object.extend(rubricks.system.user,{detail_window_close:function(){ 
     1002this.detail_window.close(); 
     1003},detail_window_open:function(){ 
     1004this.detail_window.center(); 
     1005this.detail_window.open(); 
     1006},user_detail_window_render:function(_1){ 
     1007new Ajax.Updater("user_detail_window_contents",rubricks.system.user.url_user_detail_window,{asynchronous:true,evalScripts:true,parameters:{id:_1},onLoading:function(_2){ 
     1008rubricks.common.rubricks_wait_message_open(); 
     1009}}); 
     1010},validate_difference_login_name_and_password:function(_3,_4){ 
     1011if($(_3).value==$(_4).value){ 
    10031012return this.msg_difference_login_name_and_password; 
    10041013}else{ 
    1005 this.validator_refresh_targets=[_2,_1]; 
     1014this.validator_refresh_targets=[_4,_3]; 
    10061015setTimeout(function(){ 
    10071016rubricks.system.user.validate_difference_login_name_and_password_refresh(); 
    …… 
    10111020},validate_difference_login_name_and_password_refresh:function(){ 
    10121021if($(this.validator_refresh_targets[0]+"_msg").innerHTML.match(/icon_stop/)){ 
    1013 var _3=$(this.validator_refresh_targets[1]+"_msg").innerHTML; 
    1014 if(_3.match(/icon_accept/)){ 
     1022var _5=$(this.validator_refresh_targets[1]+"_msg").innerHTML; 
     1023if(_5.match(/icon_accept/)){ 
    10151024rubricks.common.Validator.refresh_by_id(this.validator_refresh_targets[0]); 
    10161025}else{ 
    1017 if(_3.match(/icon_wait/)){ 
     1026if(_5.match(/icon_wait/)){ 
    10181027setTimeout(function(){ 
    10191028rubricks.system.user.validate_difference_login_name_and_password_refresh(); 
    …… 
    13251334rubricks.common.rubricks_wait_message_open(); 
    13261335}}); 
    1327 },user_detail_window_close:function(){ 
    1328 rubricks.system.admin_user.variables.user_detail_window.close(); 
    1329 },user_detail_window_open:function(_3f){ 
    1330 var _40=rubricks.system.admin_user.variables; 
    1331 _40.user_detail_window.center(); 
    1332 _40.user_detail_window.open(); 
    1333 },user_detail_window_render:function(_41){ 
    1334 new Ajax.Updater("user_detail_window_contents",rubricks.system.admin_user.variables.url_user_detail_window,{asynchronous:true,evalScripts:true,parameters:{id:_41},onLoading:function(_42){ 
     1336},user_detail_window_render:function(_3f){ 
     1337new Ajax.Updater("user_detail_window_contents",rubricks.system.admin_user.variables.url_user_detail_window,{asynchronous:true,evalScripts:true,parameters:{id:_3f},onLoading:function(_40){ 
    13351338rubricks.common.rubricks_wait_message_open(); 
    13361339}}); 
    …… 
    13411344rubricks.system.admin_user.variables.user_export_window.close(); 
    13421345},user_export_window_open:function(){ 
    1343 var _43=rubricks.system.admin_user.variables; 
    1344 if(_43.flg_user_export_window_loaded){ 
    1345 _43.user_export_window.center(); 
    1346 _43.user_export_window.open(); 
     1346var _41=rubricks.system.admin_user.variables; 
     1347if(_41.flg_user_export_window_loaded){ 
     1348_41.user_export_window.center(); 
     1349_41.user_export_window.open(); 
    13471350}else{ 
    13481351this.user_export_window_render(); 
    13491352} 
    13501353},user_export_window_render:function(){ 
    1351 new Ajax.Updater("user_export_window_contents",rubricks.system.admin_user.variables.url_user_export_window,{asynchronous:true,evalScripts:true,onLoading:function(_44){ 
    1352 rubricks.common.rubricks_wait_message_open(); 
    1353 }}); 
    1354 },user_image_delete:function(_45){ 
    1355 new Ajax.Request(rubricks.system.admin_user.variables.url_user_image_delete,{asynchronous:true,evalScripts:true,parameters:{id:_45},onLoaded:function(_46){ 
    1356 rubricks.common.rubricks_wait_message_close(); 
    1357 },onLoading:function(_47){ 
    1358 rubricks.common.rubricks_wait_message_open(); 
    1359 }}); 
    1360 },user_image_delete_confirm:function(_48){ 
     1354new Ajax.Updater("user_export_window_contents",rubricks.system.admin_user.variables.url_user_export_window,{asynchronous:true,evalScripts:true,onLoading:function(_42){ 
     1355rubricks.common.rubricks_wait_message_open(); 
     1356}}); 
     1357},user_image_delete:function(_43){ 
     1358new Ajax.Request(rubricks.system.admin_user.variables.url_user_image_delete,{asynchronous:true,evalScripts:true,parameters:{id:_43},onLoaded:function(_44){ 
     1359rubricks.common.rubricks_wait_message_close(); 
     1360},onLoading:function(_45){ 
     1361rubricks.common.rubricks_wait_message_open(); 
     1362}}); 
     1363},user_image_delete_confirm:function(_46){ 
    13611364rubricks.common.rubricks_confirm_window_open(rubricks.system.admin_user.variables.msg_user_image_delete_confirm,function(){ 
    1362 rubricks.system.admin_user.functions.user_image_delete(_48); 
     1365rubricks.system.admin_user.functions.user_image_delete(_46); 
    13631366},function(){ 
    13641367rubricks.system.admin_user.functions.user_tab_activate(); 
    …… 
    13671370rubricks.system.admin_user.variables.user_image_window.close(); 
    13681371},user_image_window_open:function(){ 
    1369 var _49=rubricks.system.admin_user.variables; 
    1370 _49.user_image_window.center(); 
    1371 _49.user_image_window.open(); 
     1372var _47=rubricks.system.admin_user.variables; 
     1373_47.user_image_window.center(); 
     1374_47.user_image_window.open(); 
    13721375},user_import_form_clear:function(){ 
    13731376$("user_import_form").reset(); 
    …… 
    13761379rubricks.system.admin_user.variables.user_import_window.close(); 
    13771380},user_import_window_open:function(){ 
    1378 var _4a=rubricks.system.admin_user.variables; 
    1379 if(_4a.flg_user_import_window_loaded){ 
     1381var _48=rubricks.system.admin_user.variables; 
     1382if(_48.flg_user_import_window_loaded){ 
    13801383this.user_import_form_clear(); 
    1381 _4a.user_import_window.center(); 
    1382 _4a.user_import_window.open(); 
     1384_48.user_import_window.center(); 
     1385_48.user_import_window.open(); 
    13831386}else{ 
    13841387this.user_import_window_render(); 
    13851388} 
    13861389},user_import_window_render:function(){ 
    1387 new Ajax.Updater("user_import_window_contents",rubricks.system.admin_user.variables.url_user_import_window,{asynchronous:true,evalScripts:true,onLoading:function(_4b){ 
    1388 rubricks.common.rubricks_wait_message_open(); 
    1389 }}); 
    1390 },user_invalidate:function(_4c){ 
    1391 new Ajax.Request(rubricks.system.admin_user.variables.url_user_invalidate,{asynchronous:true,evalScripts:true,parameters:{invalidate_id:_4c},onLoaded:function(_4d){ 
    1392 rubricks.common.rubricks_wait_message_close(); 
    1393 },onLoading:function(_4e){ 
    1394 rubricks.common.rubricks_wait_message_open(); 
    1395 }}); 
    1396 },user_invalidate_confirm:function(_4f){ 
     1390new Ajax.Updater("user_import_window_contents",rubricks.system.admin_user.variables.url_user_import_window,{asynchronous:true,evalScripts:true,onLoading:function(_49){ 
     1391rubricks.common.rubricks_wait_message_open(); 
     1392}}); 
     1393},user_invalidate:function(_4a){ 
     1394new Ajax.Request(rubricks.system.admin_user.variables.url_user_invalidate,{asynchronous:true,evalScripts:true,parameters:{invalidate_id:_4a},onLoaded:function(_4b){ 
     1395rubricks.common.rubricks_wait_message_close(); 
     1396},onLoading:function(_4c){ 
     1397rubricks.common.rubricks_wait_message_open(); 
     1398}}); 
     1399},user_invalidate_confirm:function(_4d){ 
    13971400rubricks.common.rubricks_confirm_window_open(rubricks.system.admin_user.variables.msg_user_invalidate_confirm,function(){ 
    1398 rubricks.system.admin_user.functions.user_invalidate(_4f); 
     1401rubricks.system.admin_user.functions.user_invalidate(_4d); 
    13991402},function(){ 
    14001403rubricks.system.admin_user.functions.user_tab_activate(); 
    14011404}); 
    14021405},user_invalidate_multiple:function(){ 
    1403 var _50=rubricks.system.admin_user.variables; 
    1404 var _51=_50.rubricks_user_list; 
    1405 var _52=(_51)?_51.getSelected().join(","):""; 
    1406 if(_52.length==0){ 
    1407 rubricks.common.rubricks_message_window_open(_50.msg_user_not_selected,"error"); 
    1408 }else{ 
    1409 rubricks.common.rubricks_confirm_window_open(_50.msg_user_invalidate_confirm,function(){ 
     1406var _4e=rubricks.system.admin_user.variables; 
     1407var _4f=_4e.rubricks_user_list; 
     1408var _50=(_4f)?_4f.getSelected().join(","):""; 
     1409if(_50.length==0){ 
     1410rubricks.common.rubricks_message_window_open(_4e.msg_user_not_selected,"error"); 
     1411}else{ 
     1412rubricks.common.rubricks_confirm_window_open(_4e.msg_user_invalidate_confirm,function(){ 
    14101413rubricks.system.admin_user.functions.user_invalidate(rubricks.system.admin_user.variables.rubricks_user_list.getSelected().join(",")); 
    14111414},function(){ 
    1412 _51.makeAvailable(); 
     1415_4f.makeAvailable(); 
    14131416}); 
    14141417} 
    …… 
    14251428Element.show("user_invalidate_multiple_form"); 
    14261429} 
    1427 },user_list_select_effect:function(_53){ 
     1430},user_list_select_effect:function(_51){ 
     1431var _52=rubricks.system.admin_user.variables.rubricks_user_list; 
     1432if(_52){ 
     1433var _53=_52.getSelected(); 
     1434if(_53[0]!=_51){ 
     1435_52.selectEffect(_52.buildTrId(_51)); 
     1436} 
     1437} 
     1438},user_multiple_mode:function(){ 
    14281439var _54=rubricks.system.admin_user.variables.rubricks_user_list; 
    14291440if(_54){ 
    1430 var _55=_54.getSelected(); 
    1431 if(_55[0]!=_53){ 
    1432 _54.selectEffect(_54.buildTrId(_53)); 
    1433 } 
    1434 } 
    1435 },user_multiple_mode:function(){ 
    1436 var _56=rubricks.system.admin_user.variables.rubricks_user_list; 
    1437 if(_56){ 
    1438 _56.makeMultiple(); 
     1441_54.makeMultiple(); 
    14391442} 
    14401443this.user_list_buttons_multiple(); 
    …… 
    14451448this.user_tab_activate(); 
    14461449},user_singular_mode:function(){ 
    1447 var _57=rubricks.system.admin_user.variables.rubricks_user_list; 
    1448 if(_57){ 
    1449 _57.makeSingular(); 
     1450var _55=rubricks.system.admin_user.variables.rubricks_user_list; 
     1451if(_55){ 
     1452_55.makeSingular(); 
    14501453} 
    14511454this.user_list_buttons_singular(); 
    …… 
    14561459this.activate_tab(0); 
    14571460this.show_buttons([0]); 
    1458 },user_unlock:function(_58){ 
    1459 new Ajax.Request(rubricks.system.admin_user.variables.url_user_unlock,{asynchronous:true,evalScripts:true,parameters:{unlock_id:_58},onLoaded:function(_59){ 
    1460 rubricks.common.rubricks_wait_message_close(); 
    1461 },onLoading:function(_5a){ 
    1462 rubricks.common.rubricks_wait_message_open(); 
    1463 }}); 
    1464 },user_unlock_confirm:function(_5b){ 
     1461},user_unlock:function(_56){ 
     1462new Ajax.Request(rubricks.system.admin_user.variables.url_user_unlock,{asynchronous:true,evalScripts:true,parameters:{unlock_id:_56},onLoaded:function(_57){ 
     1463rubricks.common.rubricks_wait_message_close(); 
     1464},onLoading:function(_58){ 
     1465rubricks.common.rubricks_wait_message_open(); 
     1466}}); 
     1467},user_unlock_confirm:function(_59){ 
    14651468rubricks.common.rubricks_confirm_window_open(rubricks.system.admin_user.variables.msg_user_unlock_confirm,function(){ 
    1466 rubricks.system.admin_user.functions.user_unlock(_5b); 
     1469rubricks.system.admin_user.functions.user_unlock(_59); 
    14671470},function(){ 
    14681471rubricks.system.admin_user.functions.user_tab_activate(); 
    14691472}); 
    1470 },user_validate:function(_5c){ 
    1471 new Ajax.Request(rubricks.system.admin_user.variables.url_user_validate,{asynchronous:true,evalScripts:true,parameters:{validate_id:_5c},onLoaded:function(_5d){ 
    1472 rubricks.common.rubricks_wait_message_close(); 
    1473 },onLoading:function(_5e){ 
    1474 rubricks.common.rubricks_wait_message_open(); 
    1475 }}); 
    1476 },user_validate_confirm:function(_5f){ 
     1473},user_validate:function(_5a){ 
     1474new Ajax.Request(rubricks.system.admin_user.variables.url_user_validate,{asynchronous:true,evalScripts:true,parameters:{validate_id:_5a},onLoaded:function(_5b){ 
     1475rubricks.common.rubricks_wait_message_close(); 
     1476},onLoading:function(_5c){ 
     1477rubricks.common.rubricks_wait_message_open(); 
     1478}}); 
     1479},user_validate_confirm:function(_5d){ 
    14771480rubricks.common.rubricks_confirm_window_open(rubricks.system.admin_user.variables.msg_user_validate_confirm,function(){ 
    1478 rubricks.system.admin_user.functions.user_validate(_5f); 
     1481rubricks.system.admin_user.functions.user_validate(_5d); 
    14791482},function(){ 
    14801483rubricks.system.admin_user.functions.user_tab_activate(); 
    14811484}); 
    14821485}}); 
    1483 AjaxHistory.addCallback(function(_60){ 
    1484 rubricks.system.admin_user.functions.show_detail(_60); 
     1486AjaxHistory.addCallback(function(_5e){ 
     1487rubricks.system.admin_user.functions.show_detail(_5e); 
    14851488},"rubricks_system_admin_user"); 
    14861489 

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

    r5695 r5723  
    406406        @editable_ru_columns        = RubricksConfig.get_editable_ru_columns 
    407407        @ru                         = RubricksUser.find_effective_user(params[:id], :include => :rubricks_user_image) 
     408        @user_profile_readonly      = true 
    408409        judge_show_user(@options) 
    409410        render :template => '/system/user_management/user_detail_window.rhtml' 
    …… 
    830831          :str_permission_info              => '[_Common_PermissionInfo]', 
    831832          :str_user_create                  => '[_System_AdminUser_UserCreate]', 
    832           :str_user_detail                  => '[_Common_UserInfo]', 
    833833          :str_user_belongs_to              => '[_Common_UsersBelongsTo]', 
    834834          :str_user_export                  => '[_Common_Export]', 

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

    r5695 r5723  
    106106      def render_user_info(ru, options = {}) 
    107107        options = { 
    108           :display_kana => ((RubricksLib.current_lang == 'japanese' && RubricksConfig.get('site_display_kana')) ? true : false), 
    109           :with_detail  => false, 
    110           :with_status  => false, 
    111         }.merge(options) 
    112         html  = '' 
    113         html += %Q|<a href="#" onclick="rubricks.system.admin_user.functions.user_detail_window_render(#{ru.id}); return false;">| if options[:with_detail] 
    114         html += render_user_status(ru) if options[:with_status] 
    115         html += %Q|#{hl(ru.login_name)} (#{hl(ru.name)}| 
    116         html += (ru.kana.blank?) ? '' : " / #{hl(ru.kana)}" if options[:display_kana] 
    117         html += ')' 
    118         html += '</a>' if options[:with_detail] 
    119         return html 
     108          :package      => 'rubricks.system.admin_user.functions', 
     109          :type         => 'full', 
     110          :with_detail  => true, 
     111        }.merge(options) 
     112        html  = [] 
     113        html << %Q|<a href="#" onclick="#{options[:package]}.user_detail_window_render(#{ru.id}); return false;">| if options[:with_detail] && !print? 
     114        case options[:type] 
     115        when 'full' 
     116          display_kana = ((RubricksLib.current_lang == 'japanese' && RubricksConfig.get('site_display_kana')) ? true : false) 
     117          html << render_user_status(ru) 
     118          html << %Q|#{hl(ru.login_name)} (#{hl(ru.name)}| 
     119          html << %Q| / #{hl(ru.kana)}| if options[:with_id] && display_kana && !ru.kana.blank? 
     120          html << %Q|)| 
     121        when 'id' 
     122          html << hl(ru.login_name) 
     123        when 'name' 
     124          html << hl(ru.name) 
     125        end 
     126        html << '</a>' if options[:with_detail] && !print? 
     127        return html.join('') 
     128      end 
     129 
     130      def render_user_link(ru) 
     131        render_user_info(ru, {:package => 'rubricks.system.user', :type => 'name'}) 
    120132      end 
    121133 
    …… 
    147159      end 
    148160 
    149       def render_users(ru_list, options = {}) 
    150         options = { 
    151           :with_detail  => false, 
    152           :with_status  => false, 
    153         }.merge(options) 
     161      def render_users(ru_list) 
    154162        html  = '' 
    155163        ru_list.each do |ru| 
    156164          html += %Q|<tr class="#{cycle('rubricks_general_table_odd', 'rubricks_general_table_even')}">| 
    157165          html += '<td>' 
    158           html += render_user_info(ru, options) 
     166          html += render_user_info(ru) 
    159167          html += '</td>' 
    160168          html += '</tr>' 
    …… 
    184192          return {:open => true} 
    185193        end 
     194      end 
     195 
     196      def user_profile_editable? 
     197        return @user_profile_readonly.blank? 
    186198      end 
    187199