jro_apps/redmine Commit - r9847:bb2af97dcf4b

Removes calls to link_to_remote....

Jean-Philippe Lang -

r9847:bb2af97dcf4b

parent child

Context file:

r9847:bb2af97dcf4b

Collapse all files

app/views/groups/_memberships.html.erb +3 -8

             <% roles = Role.find_all_givable %>
             <% projects = Project.active.find(:all, :order => 'lft') %>
             <div class="splitcontentleft">
             <% if @group.memberships.any? %>
             <table class="list memberships">
               <thead><tr>
                 <th><%= l(:label_project) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
               </tr></thead>
               <tbody>
               <% @group.memberships.each do |membership| %>
               <% next if membership.new_record? %>
               <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
               <td class="project"><%=h membership.project %></td>
               <td class="roles">
                 <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
                 <%= form_for(:membership, :remote => true,
                              :url => { :action => 'edit_membership', :id => @group, :membership_id => membership },
                              :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
                     <% end %></p>
                     <p><%= submit_tag l(:button_change) %>
                     <%= link_to_function(
                           l(:button_cancel),
                           "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;"
                         ) %></p>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function(
                         l(:button_edit),
                         "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;",
                         :class => 'icon icon-edit'
                       ) %>
-                  <%= link_to_remote(
+                  <%= delete_link({:controller => 'groups', :action => 'destroy_membership', :id => @group, :membership_id => membership},
-                        l(:button_delete),
+                                  :remote => true,
-                        { :url => { :controller => 'groups',
+                                  :method => :post) %>
-                                    :action => 'destroy_membership',
-                                    :id => @group,
-                                    :membership_id => membership },
-                           :method => :post },
-                        :class => 'icon icon-del' ) %>
               </td>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if projects.any? %>
             <fieldset><legend><%=l(:label_project_new)%></legend>
             <%= form_for(:membership, :remote => true, :url => { :action => 'edit_membership', :id => @group }) do %>
             <%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %>
             <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>
             <p><%= l(:label_role_plural) %>:
             <% roles.each do |role| %>
               <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
             <% end %></p>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             </fieldset>
             <% end %>
             </div>

app/views/groups/_users.html.erb +1 -6

             <div class="splitcontentleft">
             <% if @group.users.any? %>
               <table class="list users">
                 <thead><tr>
                   <th><%= l(:label_user) %></th>
                   <th style="width:15%"></th>
                 </tr></thead>
                 <tbody>
                 <% @group.users.sort.each do |user| %>
                   <tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
                     <td class="user"><%= link_to_user user %></td>
                     <td class="buttons">
-                        <%= link_to_remote(
+                      <%= delete_link group_user_path(@group, :user_id => user), :remote => true %>
-                              l(:button_delete),
-                              { :url => group_user_path(@group, :user_id => user),
-                                :method => :delete },
-                              :class => 'icon icon-del'
-                            ) %>
                     </td>
                   </tr>
                 <% end %>
                 </tbody>
               </table>
             <% else %>
               <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% users = User.active.not_in_group(@group).all(:limit => 100) %>
             <% if users.any? %>
               <%= form_for(@group, :remote => true, :url => group_users_path(@group),
                            :html => {:method => :post}) do |f| %>
                 <fieldset><legend><%=l(:label_user_new)%></legend>
                 <p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
                 <%= observe_field(:user_search,
                              :frequency => 0.5,
                              :update => :users,
                              :url => autocomplete_for_user_group_path(@group),
                              :method => :get,
                              :before => '$("user_search").addClassName("ajax-loading")',
                              :complete => '$("user_search").removeClassName("ajax-loading")',
                              :with => 'q')
                               %>
                 <div id="users">
                   <%= principals_check_box_tags 'user_ids[]', users %>
                 </div>
                 <p><%= submit_tag l(:button_add) %></p>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages