@@ -32,10 +32,12 | |||||
32 | </form> |
|
32 | </form> | |
33 | <% end %> |
|
33 | <% end %> | |
34 |
|
34 | |||
35 |
<% |
|
35 | <%= form_for @relation, { | |
|
36 | :as => :relation, :remote => true, | |||
36 | :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue}, |
|
37 | :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue}, | |
37 | :method => :post, |
|
38 | :method => :post, | |
38 | :complete => "Form.Element.focus('relation_issue_to_id');", |
|
39 | :complete => "Form.Element.focus('relation_issue_to_id');", | |
39 |
:html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')} |
|
40 | :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')} | |
|
41 | } do |f| %> | |||
40 | <%= render :partial => 'issue_relations/form', :locals => {:f => f}%> |
|
42 | <%= render :partial => 'issue_relations/form', :locals => {:f => f}%> | |
41 | <% end %> |
|
43 | <% end %> |
@@ -18,9 +18,10 | |||||
18 | <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td> |
|
18 | <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td> | |
19 | <td class="roles"> |
|
19 | <td class="roles"> | |
20 | <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span> |
|
20 | <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span> | |
21 |
<% |
|
21 | <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), | |
22 | :method => :put, |
|
22 | :method => :put, | |
23 |
:html => { :id => "member-#{member.id}-roles-form", :class => 'hol' } |
|
23 | :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }} | |
|
24 | ) do |f| %> | |||
24 | <p><% roles.each do |role| %> |
|
25 | <p><% roles.each do |role| %> | |
25 | <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), |
|
26 | <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), | |
26 | :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br /> |
|
27 | :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br /> | |
@@ -59,9 +60,11 | |||||
59 |
|
60 | |||
60 | <div class="splitcontentright"> |
|
61 | <div class="splitcontentright"> | |
61 | <% if roles.any? && principals.any? %> |
|
62 | <% if roles.any? && principals.any? %> | |
62 | <% remote_form_for(:membership, @member, :url => project_memberships_path(@project), :method => :post, |
|
63 | <%= form_for(@member, {:as => :membership, :remote => true, | |
|
64 | :url => project_memberships_path(@project), :method => :post, | |||
63 | :loading => '$(\'member-add-submit\').disable();', |
|
65 | :loading => '$(\'member-add-submit\').disable();', | |
64 |
:complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();' |
|
66 | :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();' | |
|
67 | } ) do |f| %> | |||
65 | <fieldset><legend><%=l(:label_member_new)%></legend> |
|
68 | <fieldset><legend><%=l(:label_member_new)%></legend> | |
66 |
|
69 | |||
67 | <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p> |
|
70 | <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p> |
@@ -24,7 +24,7 | |||||
24 | </ul> |
|
24 | </ul> | |
25 |
|
25 | |||
26 | <% if manage_allowed %> |
|
26 | <% if manage_allowed %> | |
27 | <% remote_form_for(:issue, @issue, |
|
27 | <%= form_for(@issue, :as => :issue, :remote => true, | |
28 | :url => {:controller => 'repositories', :action => 'add_related_issue', |
|
28 | :url => {:controller => 'repositories', :action => 'add_related_issue', | |
29 | :id => @project, :repository_id => @repository.identifier_param, |
|
29 | :id => @project, :repository_id => @repository.identifier_param, | |
30 | :rev => @changeset.identifier}, |
|
30 | :rev => @changeset.identifier}, |
General Comments 0
You need to be logged in to leave comments.
Login now