Changeset 5792

Show
Ignore:
Timestamp:
06/12/08 08:42:28 (2 months ago)
Author:
uta
Message:

2008/06/12 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • components/bbs/trunk/bbs/_install/component_info.rb

    r5768 r5792  
    4343        :function       => 'admin', 
    4444        :description    => '' 
     45      }, 
     46      { 
     47        :extend_page    => 'main', 
     48        :title          => '[_Bbs_Personalize_Setting]', 
     49        :controller     => '/bbs/personalize', 
     50        :function       => 'access', 
     51        :description    => '' 
    4552      } 
    4653    ] 

  • components/bbs/trunk/bbs/_install/installation_script.rb

    r5696 r5792  
    2020    item = RubricksMenuItem.find(:first, :conditions => ["controller = ?", "/bbs/admin_group"]) 
    2121    item.destroy if item 
     22     
     23    item = RubricksMenuItem.find(:first, :conditions => ["controller = ?", "/bbs/admin"]) 
     24    item.destroy if item 
    2225  end 
    2326end 

  • components/bbs/trunk/bbs/bbs/_bbs_permission_window.rhtml

    r5703 r5792  
    1515) do %> 
    1616  <%= form_remote_tag(:update => 'bbs_info',:url => {:controller=>'/bbs/bbs', :action=>'save_bbs_permission'}, :html => { :id => 'bbs_permission_form'},  :complete => 'rubricks.bbs.close_bbs_permission_window();rubricks.bbs.bbs_refresh_flag = true;')%> 
     17    <%= hidden_field 'save_bbs_permission', 'bbs_tree_closed_ids'%> 
    1718    <table> 
    1819      <tr> 
    …… 
    3334               <div id="create_category_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    3435                 <div id="test" style="float: left;height:130px;"> 
     36                         <div id="bbs_create_sysgroup_div" class="float_button_left_inactive swap"> 
     37                           <span id="create_category_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_create_group_tree') %>', 'create_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     38                         </div> 
     39                         <div id="bbs_create_org_div" class="float_button_left_inactive swap"> 
     40                           <span id="create_category_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_create_organization_tree') %>', 'user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     41                         </div> 
     42                         <div id="bbs_create_div2" class="float_button_left_inactive swap"> 
     43                           <span id='create_category_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_create_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     44                         </div> 
     45                         <br style="clear:both;" /> 
    3546                   <table> 
    3647                     <tr> 
    …… 
    4051                       </td> 
    4152                       <td style="vertical-align:bottom;width:145px"> 
    42                          <div id="bbs_create_div1" class="float_button_right_inactive swap"> 
     53                         <div id="bbs_create_div1" class="float_button_left_inactive swap"> 
    4354                           <span id='create_category_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('create_category_to_members_users'),0);rubricks.common.fire_onchange('create_category_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    4455                         </div> 
    45                          <div id="bbs_create_div2" class="float_button_right_inactive swap"> 
    46                            <span id='create_category_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_create_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    47                          </div> 
    48                        <%= rollover_swap('bbs_create_div1', 'bbs_create_div2') %> 
    4956                       </td> 
    5057                     </tr> 
    5158                   </table> 
     59                   <%= rollover_swap('bbs_create_org_div','bbs_create_sysgroup_div','bbs_create_div1', 'bbs_create_div2') %> 
    5260                 </div> 
    5361              </div> 
    …… 
    7179               <div id="bbs_post_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    7280                 <div style="height:130px;float: left" > 
     81                         <div id="bbs_post_sysgroup_div" class="float_button_left_inactive swap"> 
     82                           <span id="bbs_post_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_post_group_tree') %>', 'create_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     83                         </div> 
     84                         <div id="bbs_post_org_div" class="float_button_left_inactive swap"> 
     85                           <span id="bbs_post_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_post_organization_tree') %>', 'user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     86                         </div> 
     87                         <div id="bbs_post_div2" class="float_button_left_inactive swap"> 
     88                     <span id='bbs_post_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_post_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     89                         </div> 
     90                         <br style="clear:both;" /> 
    7391                   <table> 
    7492                     <tr> 
    …… 
    7896                       </td> 
    7997                       <td style="vertical-align:bottom;width:145px"> 
    80                          <div id="bbs_post_div1" class="float_button_right_inactive swap"> 
     98                         <div id="bbs_post_div1" class="float_button_left_inactive swap"> 
    8199                          <span id='bbs_post_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('bbs_post_to_members_users'),1);rubricks.common.fire_onchange('bbs_post_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    82100                         </div> 
    83                          <div id="bbs_post_div2" class="float_button_right_inactive swap"> 
    84                            <span id='bbs_post_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_post_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    85                          </div> 
    86                        <%= rollover_swap('bbs_post_div1', 'bbs_post_div2') %> 
    87101                       </td> 
    88102                     </tr> 
    89103                   </table> 
     104                   <%= rollover_swap('bbs_post_sysgroup_div', 'bbs_post_org_div','bbs_post_div1', 'bbs_post_div2') %> 
    90105                 </div> 
    91106              </div> 
    …… 
    109124               <div id="bbs_view_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    110125                 <div style="height:130px;float: left"> 
     126                   <div id="bbs_view_sysgroup_div" class="float_button_left_inactive swap"> 
     127                           <span id="bbs_view_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_view_group_tree') %>', 'create_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     128                         </div> 
     129                         <div id="bbs_view_org_div" class="float_button_left_inactive swap"> 
     130                           <span id="bbs_view_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_view_organization_tree') %>', 'user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     131                         </div> 
     132                         <div id="bbs_view_div2" class="float_button_left_inactive swap"> 
     133                     <span id='bbs_view_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_view_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     134                         </div> 
     135                         <br style="clear:both;" /> 
    111136                   <table> 
    112137                     <tr> 
    …… 
    116141                       </td> 
    117142                       <td style="vertical-align:bottom;width:145px"> 
    118                          <div id="bbs_view_div1" class="float_button_right_inactive swap"> 
     143                         <div id="bbs_view_div1" class="float_button_left_inactive swap"> 
    119144                           <span id='bbs_view_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('bbs_view_to_members_users'),2);rubricks.common.fire_onchange('bbs_view_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    120145                         </div> 
    121                          <div id="bbs_view_div2" class="float_button_right_inactive swap"> 
    122                            <span id='bbs_view_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs', :action => 'open_view_user_tree') %>', 'user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    123                          </div> 
    124                        <%= rollover_swap('bbs_view_div1', 'bbs_view_div2') %> 
    125146                       </td> 
    126147                     </tr> 
    127148                   </table> 
     149                   <%= rollover_swap('bbs_view_sysgroup_div', 'bbs_view_org_div','bbs_view_div1', 'bbs_view_div2') %> 
    128150                  </div> 
    129151              </div> 
    …… 
    135157    <div class="rubricks_layout_buttons"> 
    136158      <input id="dummy_text" type="text" style="display: none;"/> 
    137       <%= once_submit_tag 'bbs_permission_save_button', hl('[_Common_Save]'), {:class=>'swap submit_inactive submit_normal', :onclick=>"rubricks.bbs.bbs_permission_form_submit();"} %> 
     159      <%= once_submit_tag 'bbs_permission_save_button', hl('[_Common_Save]'), {:class=>'swap submit_inactive submit_normal', :onclick=>"$('save_bbs_permission_bbs_tree_closed_ids').value = $('bbs_tree_ids_hidden').value;rubricks.bbs.bbs_permission_form_submit();"} %> 
    138160      <input id="bbs_permission_cancel_button" type="button" class="swap submit_inactive submit_normal" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.bbs.close_bbs_permission_window();"> 
    139161      <%= rollover_swap('bbs_permission_save_button', 'bbs_permission_cancel_button') %> 
    …… 
    142164 </form> 
    143165<% end %> 
    144  
    145 <div id="user_select_div" style="display: none;"> 
     166<div id="create_user_select_div" style="visibility: hidden;"></div>  
     167<div id="user_select_div" style="display:none;"> 
    146168  <!-- ナヌザ遞択ダむアログ --> 
    147169  <%# render :partial => "create_user_tree", :locals => { :prefix => "bbs"} %> 
    …… 
    160182      $('create_category_to_members_users').options.length = 0; 
    161183      var opts = $('create_category_to_members_users').options; 
    162       var optsArray = $A(opts); 
     184      <% @create_grade_sysgroups.each do |m| -%> 
     185         var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     186         ru_name = ru_name.unescapeHTML(); 
     187         var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     188         var opt = new Option(ru_name, u_id); 
     189         opts[cnt] = opt; 
     190         cnt++; 
     191         rubricks.common.fire_onchange('create_category_to_members_users'); 
     192      <% end if @create_grade_sysgroups -%> 
     193       
     194      <% @create_grade_groups.each do |g| -%> 
     195         var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     196         ru_name = ru_name.unescapeHTML(); 
     197         var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     198         var opt = new Option(ru_name, u_id); 
     199         opts[cnt] = opt; 
     200         cnt++; 
     201         rubricks.common.fire_onchange('create_category_to_members_users'); 
     202      <% end if @create_grade_groups -%> 
     203       
    163204      <% @create_grade_users.each do |u| -%> 
    164205         var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    165206         ru_name = ru_name.unescapeHTML(); 
    166          var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    167          login_name = login_name.unescapeHTML(); 
    168          var u_id = "<%= hl(u.rubricks_user.id) %>"; 
     207         var u_id = "u:<%= hl(u.rubricks_user.id) %>"; 
    169208         var opt = new Option(ru_name, u_id); 
    170          opt.setAttribute("login_name",login_name); 
    171209         opts[cnt] = opt; 
    172210         cnt++; 
    …… 
    182220      $('bbs_post_to_members_users').options.length = 0; 
    183221      var opts_read = $('bbs_post_to_members_users').options; 
    184       var optsArray_read = $A(opts_read); 
    185222      var i = 0; 
     223      <% @post_grade_sysgroups.each do |m| -%> 
     224        var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     225        ru_name = ru_name.unescapeHTML(); 
     226        var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     227        var opt = new Option(ru_name, u_id); 
     228        opts_read[i] = opt; 
     229        i++; 
     230        rubricks.common.fire_onchange('bbs_post_to_members_users'); 
     231      <% end if @post_grade_sysgroups -%> 
     232      <% @post_grade_groups.each do |g| -%> 
     233        var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     234        ru_name = ru_name.unescapeHTML(); 
     235        var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     236        var opt = new Option(ru_name, u_id); 
     237        opts_read[i] = opt; 
     238        i++; 
     239        rubricks.common.fire_onchange('bbs_post_to_members_users'); 
     240      <% end if @post_grade_groups -%> 
     241       
    186242      <% @post_grade_users.each do |u| -%> 
    187243          var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    188244          ru_name = ru_name.unescapeHTML(); 
    189           var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    190           login_name = login_name.unescapeHTML(); 
    191           var u_id = "<%= hl(u.rubricks_user.id) %>"; 
     245          var u_id = "u:<%= hl(u.rubricks_user.id) %>"; 
    192246          var opt = new Option(ru_name, u_id); 
    193           opt.setAttribute("login_name",login_name); 
    194247          opts_read[i] = opt; 
    195248          i++; 
    …… 
    205258      $('bbs_view_to_members_users').options.length = 0; 
    206259      var opts_read = $('bbs_view_to_members_users').options; 
    207       var optsArray_read = $A(opts_read); 
    208260      var i = 0; 
     261      <% @view_grade_sysgroups.each do |m| -%> 
     262        var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     263        ru_name = ru_name.unescapeHTML(); 
     264        var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     265        var opt = new Option(ru_name, u_id); 
     266        opts_read[i] = opt; 
     267        i++; 
     268        rubricks.common.fire_onchange('bbs_view_to_members_users'); 
     269      <% end if @view_grade_sysgroups -%> 
     270      <% @view_grade_groups.each do |g| -%> 
     271        var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     272        ru_name = ru_name.unescapeHTML(); 
     273        var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     274        var opt = new Option(ru_name, u_id); 
     275        opts_read[i] = opt; 
     276        i++; 
     277        rubricks.common.fire_onchange('bbs_view_to_members_users'); 
     278      <% end if @view_grade_groups -%> 
    209279      <% @view_grade_users.each do |u| -%> 
    210           var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    211           ru_name = ru_name.unescapeHTML(); 
    212           var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    213           login_name = login_name.unescapeHTML(); 
    214           var u_id = "<%= hl(u.rubricks_user.id) %>"; 
    215           var opt = new Option(ru_name, u_id); 
    216           opt.setAttribute("login_name",login_name); 
    217           opts_read[i] = opt; 
    218           i++; 
    219           rubricks.common.fire_onchange('bbs_view_to_members_users'); 
     280        var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
     281        ru_name = ru_name.unescapeHTML(); 
     282        var u_id = "u:<%= hl(u.rubricks_user.id) %>"; 
     283        var opt = new Option(ru_name, u_id); 
     284        opts_read[i] = opt; 
     285        i++; 
     286        rubricks.common.fire_onchange('bbs_view_to_members_users');     
    220287      <% end if @view_grade_users -%> 
    221288    }      

  • components/bbs/trunk/bbs/bbs/_category_permission_window.rhtml

    r5703 r5792  
    1515) do %> 
    1616  <%= form_remote_tag(:update => 'bbs_tree_frame',:url => {:controller=>'/bbs/bbs_category', :action=>'save_category_permission'}, :html => { :id => 'category_permission_form'},  :complete => 'rubricks.bbs.close_category_permission_window();rubricks.bbs.bbs_refresh_flag = true;')%> 
     17    <%= hidden_field 'save_category_permission', 'bbs_tree_closed_ids'%> 
    1718    <table> 
    1819      <tr> 
    …… 
    3334               <div id="create_forum_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    3435                 <div style="float: left;height:130px;"> 
     36                         <div id="category_create_sysgroup_div" class="float_button_left_inactive swap"> 
     37                           <span id="create_forum_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_create_group_tree') %>', 'create_category_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     38                         </div> 
     39                         <div id="category_create_org_div" class="float_button_left_inactive swap"> 
     40                           <span id="create_forum_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_create_organization_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     41                         </div> 
     42                         <div id="category_create_div2" class="float_button_left_inactive swap"> 
     43                      <span id='create_forum_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_create_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     44                         </div> 
     45                         <br style="clear:both;" />                    
    3546                   <table> 
    3647                     <tr> 
    …… 
    4051                       </td> 
    4152                       <td style="vertical-align:bottom;width:145px"> 
    42                          <div id="category_create_div1" class="float_button_right_inactive swap"> 
     53                         <div id="category_create_div1" class="float_button_left_inactive swap"> 
    4354                           <span id='create_forum_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('create_forum_to_members_users'),0);rubricks.common.fire_onchange('create_forum_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    4455                         </div> 
    45                          <div id="category_create_div2" class="float_button_right_inactive swap"> 
    46                            <span id='create_forum_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_create_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    47                          </div> 
    48                        <%= rollover_swap('category_create_div1', 'category_create_div2') %> 
    4956                       </td> 
    5057                     </tr> 
    5158                   </table> 
     59                   <%= rollover_swap('category_create_sysgroup_div','category_create_org_div','category_create_div1', 'category_create_div2') %> 
    5260                 </div> 
    5361              </div> 
    …… 
    7179               <div id="category_post_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    7280                 <div style="height:130px;float: left"> 
     81                         <div id="category_post_sysgroup_div" class="float_button_left_inactive swap"> 
     82                           <span id="category_post_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_post_group_tree') %>', 'create_category_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     83                         </div> 
     84                         <div id="category_post_org_div" class="float_button_left_inactive swap"> 
     85                           <span id="category_post_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_post_organization_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     86                         </div> 
     87                         <div id="category_post_div2" class="float_button_left_inactive swap"> 
     88                     <span id='category_post_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_post_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     89                         </div> 
     90                         <br style="clear:both;" /> 
    7391                   <table> 
    7492                     <tr> 
    …… 
    7896                       </td> 
    7997                       <td style="vertical-align:bottom;width:145px"> 
    80                          <div id="category_post_div1" class="float_button_right_inactive swap"> 
     98                         <div id="category_post_div1" class="float_button_left_inactive swap"> 
    8199                           <span id='category_post_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('category_post_to_members_users'),1);rubricks.common.fire_onchange('category_post_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    82100                         </div> 
    83                          <div id="category_post_div2" class="float_button_right_inactive swap"> 
    84                            <span id='category_post_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_post_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    85                          </div> 
    86                        <%= rollover_swap('category_post_div1', 'category_post_div2') %> 
    87101                       </td> 
    88102                     </tr> 
    89103                   </table> 
     104                   <%= rollover_swap('category_post_sysgroup_div', 'category_post_org_div','category_post_div1', 'category_post_div2') %> 
    90105                 </div> 
    91106              </div> 
    …… 
    109124               <div id="category_view_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    110125                 <div style="height:130px;float: left"> 
     126                   <div id="category_view_sysgroup_div" class="float_button_left_inactive swap"> 
     127                           <span id="category_view_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_view_group_tree') %>', 'create_category_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     128                         </div> 
     129                         <div id="category_view_org_div" class="float_button_left_inactive swap"> 
     130                           <span id="category_view_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_view_organization_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     131                         </div> 
     132                         <div id="category_view_div2" class="float_button_left_inactive swap"> 
     133                     <span id='category_view_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_view_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     134                         </div> 
     135                         <br style="clear:both;"/> 
    111136                   <table> 
    112137                     <tr> 
    …… 
    116141                       </td> 
    117142                       <td style="vertical-align:bottom;width:145px"> 
    118                          <div id="category_view_div1" class="float_button_right_inactive swap"> 
     143                         <div id="category_view_div1" class="float_button_left_inactive swap"> 
    119144                           <span id='category_view_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('category_view_to_members_users'),2);rubricks.common.fire_onchange('category_view_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    120145                         </div> 
    121                          <div id="category_view_div2" class="float_button_right_inactive swap"> 
    122                            <span id='category_view_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_category', :action => 'open_view_user_tree') %>', 'category_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    123                          </div> 
    124                        <%= rollover_swap('category_view_div1', 'category_view_div2') %> 
    125146                       </td> 
    126147                     </tr> 
    127148                   </table> 
     149                   <%= rollover_swap('category_view_sysgroup_div', 'category_view_org_div','category_view_div1', 'category_view_div2') %> 
    128150                  </div> 
    129151              </div> 
    …… 
    135157    <div class="rubricks_layout_buttons"> 
    136158      <input id="dummy_text" type="text" style="display: none;"/> 
    137       <%= once_submit_tag 'category_permission_save_button', hl('[_Common_Save]'), {:class=>'swap submit_inactive submit_normal', :onclick=>"rubricks.bbs.category_permission_form_submit();"} %> 
     159      <%= once_submit_tag 'category_permission_save_button', hl('[_Common_Save]'), {:class=>'swap submit_inactive submit_normal', :onclick=>"$('save_category_permission_bbs_tree_closed_ids').value = $('bbs_tree_ids_hidden').value;rubricks.bbs.category_permission_form_submit();"} %> 
    138160      <input id="category_permission_cancel_button" type="button" class="swap submit_inactive submit_normal" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.bbs.close_category_permission_window();"> 
    139161      <%= rollover_swap('category_permission_save_button', 'category_permission_cancel_button') %> 
    …… 
    142164  </form> 
    143165<% end %> 
    144  
     166<div id="create_category_user_select_div" style="visibility: hidden;"></div>  
    145167<div id="category_user_select_div" style="display: none;"> 
    146168  <!-- ナヌザ遞択ダむアログ --> 
    …… 
    160182      $('create_forum_to_members_users').options.length = 0; 
    161183      var opts = $('create_forum_to_members_users').options; 
    162       var optsArray = $A(opts); 
     184      <% @create_grade_sysgroups.each do |m| -%> 
     185         var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     186         ru_name = ru_name.unescapeHTML(); 
     187         var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     188         var opt = new Option(ru_name, u_id); 
     189         opts[cnt] = opt; 
     190         cnt++; 
     191         rubricks.common.fire_onchange('create_forum_to_members_users'); 
     192      <% end if @create_grade_sysgroups -%> 
     193       
     194      <% @create_grade_groups.each do |g| -%> 
     195         var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     196         ru_name = ru_name.unescapeHTML(); 
     197         var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     198         var opt = new Option(ru_name, u_id); 
     199         opts[cnt] = opt; 
     200         cnt++; 
     201         rubricks.common.fire_onchange('create_forum_to_members_users'); 
     202      <% end if @create_grade_groups -%> 
     203       
    163204      <% @create_grade_users.each do |u| -%> 
    164205         var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    165206         ru_name = ru_name.unescapeHTML(); 
    166          var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    167          login_name = login_name.unescapeHTML(); 
    168207         var u_id = "<%= hl(u.rubricks_user.id) %>"; 
    169208         var opt = new Option(ru_name, u_id); 
    170          opt.setAttribute("login_name",login_name); 
    171209         opts[cnt] = opt; 
    172210         cnt++; 
    …… 
    182220      $('category_post_to_members_users').options.length = 0; 
    183221      var opts_read = $('category_post_to_members_users').options; 
    184       var optsArray_read = $A(opts_read); 
    185222      var i = 0; 
     223      <% @post_grade_sysgroups.each do |m| -%> 
     224        var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     225        ru_name = ru_name.unescapeHTML(); 
     226        var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     227        var opt = new Option(ru_name, u_id); 
     228        opts_read[i] = opt; 
     229        i++; 
     230        rubricks.common.fire_onchange('category_post_to_members_users'); 
     231      <% end if @post_grade_sysgroups -%> 
     232      <% @post_grade_groups.each do |g| -%> 
     233        var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     234        ru_name = ru_name.unescapeHTML(); 
     235        var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     236        var opt = new Option(ru_name, u_id); 
     237        opts_read[i] = opt; 
     238        i++; 
     239        rubricks.common.fire_onchange('category_post_to_members_users'); 
     240      <% end if @post_grade_groups -%> 
     241       
    186242      <% @post_grade_users.each do |u| -%> 
    187           var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    188           ru_name = ru_name.unescapeHTML(); 
    189           var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    190           login_name = login_name.unescapeHTML(); 
    191           var u_id = "<%= hl(u.rubricks_user.id) %>"; 
    192           var opt = new Option(ru_name, u_id); 
    193           opt.setAttribute("login_name",login_name); 
    194           opts_read[i] = opt; 
    195           i++; 
    196           rubricks.common.fire_onchange('category_post_to_members_users'); 
     243        var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
     244        ru_name = ru_name.unescapeHTML(); 
     245        var u_id = "<%= hl(u.rubricks_user.id) %>"; 
     246        var opt = new Option(ru_name, u_id); 
     247        opts_read[i] = opt; 
     248        i++; 
     249        rubricks.common.fire_onchange('category_post_to_members_users'); 
    197250      <% end if @post_grade_users -%> 
    198251    }       
    …… 
    205258      $('category_view_to_members_users').options.length = 0; 
    206259      var opts_read = $('category_view_to_members_users').options; 
    207       var optsArray_read = $A(opts_read); 
    208260      var i = 0; 
     261      <% @view_grade_sysgroups.each do |m| -%> 
     262        var ru_name = "<%= hl(m.rubricks_group.name) %>"; 
     263        ru_name = ru_name.unescapeHTML(); 
     264        var u_id = "m:<%= hl(m.rubricks_group.id) %>"; 
     265        var opt = new Option(ru_name, u_id); 
     266        opts_read[i] = opt; 
     267        i++; 
     268        rubricks.common.fire_onchange('category_view_to_members_users'); 
     269      <% end if @view_grade_sysgroups -%> 
     270      <% @view_grade_groups.each do |g| -%> 
     271        var ru_name = "<%= get_group_tree_ancestors_name(g.rubricks_group) %>"; 
     272        ru_name = ru_name.unescapeHTML(); 
     273        var u_id = "g:<%= hl(g.rubricks_group.id) %>"; 
     274        var opt = new Option(ru_name, u_id); 
     275        opts_read[i] = opt; 
     276        i++; 
     277        rubricks.common.fire_onchange('category_view_to_members_users'); 
     278      <% end if @view_grade_groups -%> 
    209279      <% @view_grade_users.each do |u| -%> 
    210           var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
    211           ru_name = ru_name.unescapeHTML(); 
    212           var login_name = "<%= hl(u.rubricks_user.login_name) %>"; 
    213           login_name = login_name.unescapeHTML(); 
    214           var u_id = "<%= hl(u.rubricks_user.id) %>"; 
    215           var opt = new Option(ru_name, u_id); 
    216           opt.setAttribute("login_name",login_name); 
    217           opts_read[i] = opt; 
    218           i++; 
    219           rubricks.common.fire_onchange('category_view_to_members_users'); 
     280        var ru_name = "<%= hl(u.rubricks_user.name) %>"; 
     281        ru_name = ru_name.unescapeHTML(); 
     282        var u_id = "<%= hl(u.rubricks_user.id) %>"; 
     283        var opt = new Option(ru_name, u_id); 
     284        opts_read[i] = opt; 
     285        i++; 
     286        rubricks.common.fire_onchange('category_view_to_members_users'); 
    220287      <% end if @view_grade_users -%> 
    221288    }     

  • components/bbs/trunk/bbs/bbs/_create_user_tree.rhtml

    r5696 r5792  
    3030  rubricks.bbs.<%= prefix %>_create_tree_with_users_multiple_window_open = function(target_id) { 
    3131    var elSelect =  $('<%= prefix %>_create_user_select_selected'); 
    32     var opts = elSelect.options; 
    33     opt_length = opts.length 
    34     for(m = opt_length - 1; m >= 0;m--){ 
    35        elSelect.removeChild(opts[m]); 
    36     }; 
    37      
    38     var srcSelect = $(target_id); 
    39     var optsSrc = srcSelect.options; 
    40     for(n = 0; n < optsSrc.length; n ++){ 
    41         var optObj = optsSrc[n];  
    42         var login_name = optObj.getAttribute('login_name'); 
    43         var data = {value:optObj.value, user_login_name:login_name, user_name:optObj.innerHTML}; 
    44         var display_name = data.user_login_name + '(' + data.user_name + ')'; 
    45         if(display_name.length > <%= RubricksUser::SELECT_BOX_STRING_LIMIT %>) { 
    46           data.title      = display_name; 
    47           data.innerHTML  = display_name.unescapeHTML().truncate(<%= RubricksUser::SELECT_BOX_STRING_LIMIT %>, '').escapeHTML() + '..'; 
    48         } else { 
    49           data.innerHTML  = display_name; 
    50         } 
    51         var el = document.createElement('option'); 
    52         var elOption = Object.extend(el, data); 
    53         elSelect.appendChild(el); 
    54     } 
     32    $A(elSelect).each(function(elOption) { elSelect.removeChild(elOption); }); 
    5533     
    5634    rubricks.bbs.<%= prefix %>_create_tree_with_users_multiple_window.center(); 
    …… 
    6442 
    6543  rubricks.org.organization.user_select_multiplex['<%= prefix %>_create_user_select_'].callbacks.after_submit = function(ids, datas) { 
    66     $(rubricks.bbs.<%= prefix %>_create_tree_with_users_multiple_window_target_id).innerHTML = ""; 
     44    if (datas.length < 1) { 
     45      rubricks.common.rubricks_message_window_open('<%= hl('[_MessageBoard_Info_UserNotSelected]') %>', 'error'); 
     46      return; 
     47    } 
    6748    var opts = $(rubricks.bbs.<%= prefix %>_create_tree_with_users_multiple_window_target_id).options; 
    6849    var optsArray = $A(opts); 
    69     var i = 0; 
     50 
    7051    datas.each(function(data) { 
    7152      var ru_name = data.name; 
    72       ru_name = ru_name.unescapeHTML(); 
    73       var login_name = data.login_name.unescapeHTML(); 
    74       var u_id = data.id; 
     53      var u_id = 'u:' + data.id; 
    7554      if (!optsArray.any(function(opt) { return opt.value == u_id; })) { 
    76         var opt = new Option(ru_name, u_id); 
    77         opt.setAttribute("login_name",login_name); 
    78         opts[opts.length] = opt; 
     55        opts[opts.length] = new Option(ru_name.unescapeHTML(), u_id); 
    7956        rubricks.common.fire_onchange(rubricks.bbs.<%= prefix %>_create_tree_with_users_multiple_window_target_id); 
    8057      } 

  • components/bbs/trunk/bbs/bbs/_forum_permission_window.rhtml

    r5703 r5792  
    1616) do %> 
    1717  <%= form_remote_tag(:update => 'bbs_tree_frame',:url => {:controller=>'/bbs/bbs_forum', :action=>'save_forum_permission'}, :html => { :id => 'forum_permission_form'},  :complete => 'rubricks.bbs.close_forum_permission_window();rubricks.bbs.bbs_refresh_flag = true;')%> 
     18    <%= hidden_field 'save_forum_permission', 'bbs_tree_closed_ids'%> 
    1819    <table> 
    1920      <tr> 
    …… 
    3435              <div id="create_topic_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    3536               <div style="float: left;height:130px;"> 
     37                 <div id="forum_create_sysgroup_div" class="float_button_left_inactive swap"> 
     38                   <span id="create_topic_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_create_group_tree') %>', 'create_forum_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     39                 </div> 
     40                 <div id="forum_create_org_div" class="float_button_left_inactive swap"> 
     41                   <span id="create_topic_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_create_organization_tree') %>', 'forum_user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     42                 </div> 
     43                 <div id="forum_create_div2" class="float_button_left_inactive swap"> 
     44                     <span id='create_topic_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_create_user_tree') %>', 'forum_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     45                 </div> 
     46                 <br style="clear:both;" />     
    3647                 <table> 
    3748                   <tr> 
    …… 
    4152                     </td> 
    4253                     <td style="vertical-align:bottom;width:145px"> 
    43                        <div id="forum_create_div1" class="float_button_right_inactive swap"> 
     54                       <div id="forum_create_div1" class="float_button_left_inactive swap"> 
    4455                         <span id='create_topic_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('create_topic_to_members_users'),0);rubricks.common.fire_onchange('create_topic_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    4556                       </div> 
    46                        <div id="forum_create_div2" class="float_button_right_inactive swap"> 
    47                          <span id='create_topic_user_tree_button' class="buttons icon_user" style='padding-left:18px;' onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_create_user_tree') %>', 'forum_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
    48                        </div> 
    49                      <%= rollover_swap('forum_create_div1', 'forum_create_div2') %> 
    5057                     </td> 
    5158                   </tr> 
    5259                 </table> 
     60                <%= rollover_swap('forum_create_sysgroup_div', 'forum_create_org_div','forum_create_div1', 'forum_create_div2') %> 
    5361                </div> 
    5462              </div> 
    …… 
    7280               <div id="forum_post_user_select_div" style="padding-left:16px;height:140px;display:none;"> 
    7381                 <div style="height:130px;float: left"> 
     82                   <div id="forum_post_sysgroup_div" class="float_button_left_inactive swap"> 
     83                           <span id="forum_post_sysgroup_select_button" class="buttons icon_group" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_post_group_tree') %>', 'create_forum_user_select_div');"><%= hl('[_Bbs_SelectGroup]') %></span> 
     84                         </div> 
     85                         <div id="forum_post_org_div" class="float_button_left_inactive swap"> 
     86                           <span id="forum_post_org_tree_button" class="buttons icon_org" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_post_organization_tree') %>', 'forum_user_select_div');"><%= hl('[_Bbs_SelectOrganization]') %></span> 
     87                         </div> 
     88                         <div id="forum_post_div2" class="float_button_left_inactive swap"> 
     89                     <span id='forum_post_user_tree_button' class="buttons icon_user" onclick="rubricks.bbs.common_updater('<%= url_for(:controller => '/bbs/bbs_forum', :action => 'open_post_user_tree') %>', 'forum_user_select_div');"><%= hl('[_Bbs_Common_User]') %></span> 
     90                         </div> 
     91                         <br style="clear:both;" /> 
    7492                   <table> 
    7593                     <tr> 
    …… 
    7997                       </td> 
    8098                       <td style="vertical-align:bottom;width:145px"> 
    81                          <div id="forum_post_div1" class="float_button_right_inactive swap"> 
     99                         <div id="forum_post_div1" class="float_button_leftt_inactive swap"> 
    82100                           <span id='forum_post_user_delete_button' class="buttons icon_delete" style='padding-left:18px;' onclick="rubricks.bbs.delete_selected_to_members($('forum_post_to_members_users'),1);rubricks.common.fire_onchange('forum_post_to_members_users');"><%= hl('[_Common_Delete]') %></span> 
    83101                         </div> 
    84                          <div id="forum_post_div2" class="float_button_right_inactive swap"> 
    85                           <span id='forum_post_user_tree_button' class="buttons icon_user" styl