diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-06-03 23:26:35 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-06-03 23:26:35 +0000 |
| commit | 80a52e17d0ef938253416869443b1a01fc07ac39 (patch) | |
| tree | 721a11550a58710129679d931987d0cc705d2c87 /app/views | |
| parent | c1bb0e70a3a1c7ebacf51e828648f36990721f3c (diff) | |
| download | redmine-80a52e17d0ef938253416869443b1a01fc07ac39.tar.gz redmine-80a52e17d0ef938253416869443b1a01fc07ac39.zip | |
Some fixes for r18214 (#31496):
* incorrect icon-toggle-plus and icon-toggle-minus background rules
* broken CSS rule in .toggle-multiselect and removes some unnecessary rules
* some cases where clicking on toggle-multiselect element adds the icon class to "a" element instead of "span"
* icon switch in workflow permissions tab
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@18224 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/workflows/edit.html.erb | 4 | ||||
| -rw-r--r-- | app/views/workflows/permissions.html.erb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb index 66eb11a86..3f3e3c2f5 100644 --- a/app/views/workflows/edit.html.erb +++ b/app/views/workflows/edit.html.erb @@ -64,11 +64,11 @@ $("a[data-expands]").click(function(e){ e.preventDefault(); var target = $($(this).attr("data-expands")); if (target.attr("multiple")) { - $(event.target).switchClass('icon-toggle-minus', 'icon-toggle-plus'); + $(this).find('span').switchClass('icon-toggle-minus', 'icon-toggle-plus'); target.attr("multiple", false); target.find("option[value=all]").show(); } else { - $(event.target).switchClass('icon-toggle-plus', 'icon-toggle-minus'); + $(this).find('span').switchClass('icon-toggle-plus', 'icon-toggle-minus'); target.attr("multiple", true); target.find("option[value=all]").attr("selected", false).hide(); } diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index a9af3d208..60ad1c73c 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -112,9 +112,11 @@ $("a[data-expands]").click(function(e){ e.preventDefault(); var target = $($(this).attr("data-expands")); if (target.attr("multiple")) { + $(this).find('span').switchClass('icon-toggle-minus', 'icon-toggle-plus'); target.attr("multiple", false); target.find("option[value=all]").show(); } else { + $(this).find('span').switchClass('icon-toggle-plus', 'icon-toggle-minus'); target.attr("multiple", true); target.find("option[value=all]").attr("selected", false).hide(); } |