Redmine 4.1.1

app/views/principal_memberships/_edit.html.erb

@@ -1,13 +1,16 @@
-<%= form_for(:membership, :url => principal_membership_path(@principal, @membership),
+<%= form_for(@membership, :url => principal_membership_path(@principal, @membership),
+                          :as => :membership,
                           :remote => request.xhr?,
                           :method => :put) do %>
   <p>
   <% @roles.each do |role| %>
-    <label>
-      <%= check_box_tag 'membership[role_ids][]', role.id, @membership.roles.to_a.include?(role),
-            :disabled => !@membership.role_editable?(role),
-            :id => nil %> <%= role.name %>
-    </label><br />
+    <label class="block">
+      <%= check_box_tag 'membership[role_ids][]',
+            role.id, @membership.roles.to_a.include?(role),
+            :id => nil,
+            :disabled => !@membership.role_editable?(role) %> <%= role.name %>
+      <%= render_role_inheritance(@membership, role) %>
+    </label>
   <% end %>
   </p>
   <%= hidden_field_tag 'membership[role_ids][]', '', :id => nil %>

app/views/principal_memberships/_new_modal.html.erb

@@ -4,6 +4,6 @@
   <%= render :partial => 'new_form' %>
   <p class="buttons">
     <%= submit_tag l(:button_add), :name => nil %>
-    <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+    <%= link_to_function l(:button_cancel), "hideModal(this);" %>
   </p>
 <% end %>