Feature #34917 » 0001-Use-Remove-label-and-link-break-icon-for-relation-re.patch
| app/helpers/application_helper.rb | ||
|---|---|---|
| 1552 | 1552 |
link_to sprite_icon('del', button_name), url, options
|
| 1553 | 1553 |
end |
| 1554 | 1554 | |
| 1555 |
def remove_link(url, options={})
|
|
| 1556 |
options = {
|
|
| 1557 |
:method => :delete, |
|
| 1558 |
:data => {:confirm => l(:text_are_you_sure)},
|
|
| 1559 |
:class => 'icon icon-link-break' |
|
| 1560 |
}.merge(options) |
|
| 1561 | ||
| 1562 |
link_to sprite_icon('link-break', l(:button_remove)), url, options
|
|
| 1563 |
end |
|
| 1564 | ||
| 1555 | 1565 |
def link_to_function(name, function, html_options={})
|
| 1556 | 1566 |
content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
|
| 1557 | 1567 |
end |
| app/helpers/watchers_helper.rb | ||
|---|---|---|
| 64 | 64 |
:object_id => object.id, |
| 65 | 65 |
:user_id => user} |
| 66 | 66 |
s << ' ' |
| 67 |
s << link_to(sprite_icon('del', l(:button_delete)), url,
|
|
| 67 |
s << link_to(sprite_icon('link-break', l(:button_remove)), url,
|
|
| 68 | 68 |
:remote => true, :method => 'delete', |
| 69 |
:class => "delete icon-only icon-del",
|
|
| 70 |
:title => l(:button_delete))
|
|
| 69 |
:class => "delete icon-only icon-link-break",
|
|
| 70 |
:title => l(:button_remove))
|
|
| 71 | 71 |
end |
| 72 | 72 |
content << content_tag('li', s, :class => "user-#{user.id}")
|
| 73 | 73 |
end |
| app/views/groups/_users.html.erb | ||
|---|---|---|
| 11 | 11 |
<tr id="user-<%= user.id %>"> |
| 12 | 12 |
<td class="name"><%= link_to_user user %></td> |
| 13 | 13 |
<td class="buttons"> |
| 14 |
<%= delete_link group_user_path(@group, :user_id => user), :remote => true %>
|
|
| 14 |
<%= remove_link group_user_path(@group, :user_id => user), :remote => true %>
|
|
| 15 | 15 |
</td> |
| 16 | 16 |
</tr> |
| 17 | 17 |
<% end %> |
| app/views/principal_memberships/_index.html.erb | ||
|---|---|---|
| 27 | 27 |
:remote => true, |
| 28 | 28 |
:class => 'icon icon-edit' |
| 29 | 29 |
%> |
| 30 |
<%= delete_link principal_membership_path(principal, membership), :remote => true if membership.deletable? %>
|
|
| 30 |
<%= remove_link principal_membership_path(principal, membership), :remote => true if membership.deletable? %>
|
|
| 31 | 31 |
</td> |
| 32 | 32 |
<%= call_table_row_hook principal, membership %> |
| 33 | 33 |
</tr> |
| app/views/projects/settings/_members.html.erb | ||
|---|---|---|
| 36 | 36 |
edit_membership_path(member), |
| 37 | 37 |
:remote => true, |
| 38 | 38 |
:class => 'icon icon-edit' %> |
| 39 |
<%= delete_link membership_path(member),
|
|
| 39 |
<%= remove_link membership_path(member),
|
|
| 40 | 40 |
:remote => true, |
| 41 | 41 |
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
|
| 42 | 42 |
</td> |
| config/locales/en.yml | ||
|---|---|---|
| 914 | 914 |
label_applied_status: Applied status |
| 915 | 915 |
label_loading: Loading... |
| 916 | 916 |
label_relation_new: New relation |
| 917 |
label_relation_delete: Delete relation
|
|
| 917 |
label_relation_delete: Remove relation
|
|
| 918 | 918 |
label_relates_to: Related to |
| 919 |
label_delete_link_to_subtask: Delete link to subtask
|
|
| 919 |
label_delete_link_to_subtask: Remove subtask
|
|
| 920 | 920 |
label_duplicates: Is duplicate of |
| 921 | 921 |
label_duplicated_by: Has duplicate |
| 922 | 922 |
label_blocks: Blocks |
| ... | ... | |
| 1200 | 1200 |
button_collapse_all: Collapse all |
| 1201 | 1201 |
button_expand_all: Expand all |
| 1202 | 1202 |
button_delete: Delete |
| 1203 |
button_remove: Remove |
|
| 1203 | 1204 |
button_create: Create |
| 1204 | 1205 |
button_create_and_continue: Create and add another |
| 1205 | 1206 |
button_test: Test |
| test/functional/groups_controller_test.rb | ||
|---|---|---|
| 162 | 162 |
assert_select 'div#tab-content-memberships' do |
| 163 | 163 |
assert_select 'a', :text => 'Private child of eCookbook' |
| 164 | 164 |
end |
| 165 |
assert_select 'div#tab-content-users a.icon-link-break', :text => 'Remove' |
|
| 166 |
assert_select 'div#tab-content-memberships a.icon-link-break', :text => 'Remove' |
|
| 165 | 167 |
end |
| 166 | 168 | |
| 167 | 169 |
def test_update |
| test/functional/projects_controller_test.rb | ||
|---|---|---|
| 1010 | 1010 |
) |
| 1011 | 1011 |
assert_response :success |
| 1012 | 1012 |
assert_select "tr#member-#{member.id}"
|
| 1013 |
assert_select 'div#tab-content-members a.icon-link-break', :text => 'Remove' |
|
| 1013 | 1014 |
end |
| 1014 | 1015 | |
| 1015 | 1016 |
def test_settings_should_show_tabs_depending_on_permission |
| test/helpers/issues_helper_test.rb | ||
|---|---|---|
| 395 | 395 |
end |
| 396 | 396 | |
| 397 | 397 |
def test_render_issue_relations |
| 398 |
User.current = User.find(1) |
|
| 398 | 399 |
issue = Issue.generate!(:status_id => 1) |
| 399 | 400 |
closed_issue = Issue.generate!(:status_id => 5) |
| 400 | 401 |
relation = IssueRelation.create!(:issue_from => closed_issue, |
| ... | ... | |
| 411 | 412 |
" closed rel-follows\">", |
| 412 | 413 |
html |
| 413 | 414 |
) |
| 415 |
assert_include 'title="Remove relation"', html |
|
| 414 | 416 | |
| 415 | 417 |
html = render_issue_relations(closed_issue, [relation]) |
| 416 | 418 |
assert_include( |
| ... | ... | |
| 422 | 424 |
" rel-precedes\">", |
| 423 | 425 |
html |
| 424 | 426 |
) |
| 427 |
assert_include 'title="Remove relation"', html |
|
| 425 | 428 |
end |
| 426 | 429 | |
| 427 | 430 |
def test_render_descendants_stats |
| test/helpers/watchers_helper_test.rb | ||
|---|---|---|
| 67 | 67 |
end |
| 68 | 68 | |
| 69 | 69 |
def test_watchers_list_should_be_sorted_by_user_name |
| 70 |
User.current = User.find(1) |
|
| 70 | 71 |
issue = Issue.find(1) |
| 71 | 72 |
[1, 2, 3].shuffle.each do |user_id| |
| 72 | 73 |
Watcher.create!(:watchable => issue, :user => User.find(user_id)) |
| ... | ... | |
| 79 | 80 |
assert_select 'li:nth-of-type(1)>a[href=?]', '/users/3', text: 'Dave Lopper' |
| 80 | 81 |
assert_select 'li:nth-of-type(2)>a[href=?]', '/users/2', text: 'John Smith' |
| 81 | 82 |
assert_select 'li:nth-of-type(3)>a[href=?]', '/users/1', text: 'Redmine Admin' |
| 83 |
assert_select 'a.delete[title=?]', 'Remove', 3 |
|
| 84 |
assert_select 'a.delete.icon-link-break', 3 |
|
| 82 | 85 |
end |
| 83 | 86 |
end |
| 84 | 87 | |
| ... | ... | |
| 89 | 92 |
assert_select 'li:nth-of-type(1)>a[href=?]', '/users/1', text: 'Admin Redmine' |
| 90 | 93 |
assert_select 'li:nth-of-type(2)>a[href=?]', '/users/3', text: 'Lopper Dave' |
| 91 | 94 |
assert_select 'li:nth-of-type(3)>a[href=?]', '/users/2', text: 'Smith John' |
| 95 |
assert_select 'a.delete[title=?]', 'Remove', 3 |
|
| 96 |
assert_select 'a.delete.icon-link-break', 3 |
|
| 92 | 97 |
end |
| 93 | 98 |
end |
| 94 | 99 |
end |
- « Previous
- 1
- …
- 4
- 5
- 6
- Next »