aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Permission cleanup and tag work

Browse Source
This commit is contained in:
Alexander Meindl 2019-03-28 18:22:49 +01:00
parent 432a0285dd
commit 1d859643c4
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/additionals_query.rb
View File

@ -90,10 +90,7 @@ module AdditionalsQuery
def watcher_values
watcher_values = [["<< #{l(:label_me)} >>", 'me']]
if project.nil? && User.current.allowed_to?(:manage_public_queries, nil, global: true) ||
User.current.allowed_to?(:manage_public_queries, project)
watcher_values += users.collect { |s| [s.name, s.id.to_s] }
end
watcher_values += users.collect { |s| [s.name, s.id.to_s] } if User.current.allowed_to?(:manage_public_queries, project, global: true)
watcher_values
end

2
app/views/additionals/_tag_list.html.slim
View File

@ -17,7 +17,9 @@
#edit_tags_form style="display: none;"
= form_tag(update_url, method: :put, multipart: true ) do
= render partial: 'tags_form'
'
= submit_tag l(:button_save), class: 'button-small'
'
= link_to l(:button_cancel), {}, onclick: "$('#edit_tags_form').hide(); $('#tags-data').show(); return false;"
- else

48
assets/stylesheets/additionals.css
View File

@ -157,6 +157,20 @@
div.clear-both { clear: both; }
/* for Redmine 3.4 - fix problem with tabs */
.default-query-settings-label label {
margin-left: -100px !important;
}
/* for Redmine 4.x - fix problem with tabs */
.default-query-settings-label-redmine4 label {
width: 250px !important;
margin-left: 0 !important;
float: none;
font-weight: normal;
text-align: left;
}
/* TAGs */
ul.tags {
@ -202,6 +216,26 @@ span.additionals-tag-label-color:hover a {
text-decoration: none !important;
}
#edit_tags_form.box { margin: 1px 5px 0 0; }
#edit_tags_form.box label {
margin-right: 5px;
font-weight: bold;
}
#edit_tags_form.box #contact_tags {
margin-bottom: 10px;
}
div#tags-data span.contextual {
float: none;
padding-left: 0;
}
#edit_tags_link { opacity: 0; }
#tags-data:hover #edit_tags_link { opacity: 1; }
img.additionals-avatar { margin-right: 0.25em; }
/* Live search */
@ -292,20 +326,6 @@ div.additionals-projects li.project.odd {
padding-left: 0;
}
/* for Redmine 3.4 - fix problem with tabs */
.default-query-settings-label label {
margin-left: -100px !important;
}
/* for Redmine 4.x - fix problem with tabs */
.default-query-settings-label-redmine4 label {
width: 250px !important;
margin-left: 0 !important;
float: none;
font-weight: normal;
text-align: left;
}
.jstb_macros {
background-image: url(../images/jstoolbar/bt_macros.png);
}