manuelcillero/suitepro
manuelcillero/suitepro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mostrar totales si procede en las listas incrustadas de consultas personalidas

Browse source
This commit is contained in:
Manuel Cillero 2019-02-07 23:33:01 +01:00
parent cc3bcf5b5b
commit d7d9785cfa
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/redmine_wiki_lists/app/views/issues/_list.html.erb → plugins/redmine_wiki_lists/app/views/issues/_embedded_list.html.erb
View file

@ -47,8 +47,14 @@
<% end -%> <% end -%>
</tbody> </tbody>
</table> </table>
<% if query.id %>
<%= l(:label_view) %> <%= link_to(l(:label_gantt_chart), project_gantt_path({:query_id => query.id})) %> (<%= link_to(query.name, project_issues_path({:query_id => query.id})) %>).
<% end %>
</div> </div>
<% if query.options.any? %>
<%= render_query_totals(@query) %>
<% end -%>
<% if query.id %>
<p class="query-issue-links"><%= l(:label_view) %> <%= link_to(l(:label_gantt_chart), project_gantt_path({:query_id => query.id})) %> (<%= link_to(query.name, project_issues_path({:query_id => query.id})) %>)</p>
<% end %>
<% end -%> <% end -%>

2
plugins/redmine_wiki_lists/lib/redmine_wiki_lists/ref_issues.rb
View file

@ -206,7 +206,7 @@ TEXT
else else
disp = context_menu.to_s # >= redmine 3.4.0 disp = context_menu.to_s # >= redmine 3.4.0
end end
disp << render(partial: 'issues/list', locals: {issues: @issues, query: @query}) disp << render(partial: 'issues/embedded_list', locals: {issues: @issues, query: @query})
end end
end end

6
public/themes/circlepro/stylesheets/application.css
View file

@ -691,6 +691,12 @@ div.wiki ul.toc li {
line-height: 1em; line-height: 1em;
margin-top: .3em; margin-top: .3em;
} }
div.wiki .query-totals,
div.wiki .query-issue-links {
font-size: 16px;
text-align: right;
margin: -1em 0 1.25em;
}
#preview fieldset { #preview fieldset {
width: auto; width: auto;
min-width: auto; min-width: auto;