Merge pull request #760 from opf/fix/grouped_work_packges_on_version_show
Fix/grouped work packges on version showpull/762/head
commit
df5caf1261
@ -0,0 +1,71 @@ |
|||||||
|
//-- copyright
|
||||||
|
// OpenProject is a project management system.
|
||||||
|
// Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU General Public License version 3.
|
||||||
|
//
|
||||||
|
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
|
||||||
|
// Copyright (C) 2006-2013 Jean-Philippe Lang
|
||||||
|
// Copyright (C) 2010-2013 the ChiliProject Team
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or
|
||||||
|
// modify it under the terms of the GNU General Public License
|
||||||
|
// as published by the Free Software Foundation; either version 2
|
||||||
|
// of the License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
//
|
||||||
|
// See doc/COPYRIGHT.rdoc for more details.
|
||||||
|
//++
|
||||||
|
|
||||||
|
(function ($) { |
||||||
|
var applicable, |
||||||
|
register_change_wp_by_status, |
||||||
|
handle_change_wp_by_status, |
||||||
|
init; |
||||||
|
|
||||||
|
applicable = function () { |
||||||
|
return $('body.controller-versions.action-show').length === 1; |
||||||
|
}; |
||||||
|
|
||||||
|
init = function () { |
||||||
|
register_change_wp_by_status(); |
||||||
|
}; |
||||||
|
|
||||||
|
register_change_wp_by_status = function () { |
||||||
|
$('#status_by_select').change(function () { |
||||||
|
handle_change_wp_by_status(); |
||||||
|
|
||||||
|
return false; |
||||||
|
}); |
||||||
|
}; |
||||||
|
|
||||||
|
handle_change_wp_by_status = function () { |
||||||
|
var form = $('#status_by_form'), |
||||||
|
url = form.attr('action'), |
||||||
|
data = form.serialize(); |
||||||
|
|
||||||
|
$.ajax({ url: url, |
||||||
|
headers: { Accept: 'text/javascript' }, |
||||||
|
data: data, |
||||||
|
complete: function (jqXHR) { |
||||||
|
form.replaceWith(jqXHR.responseText); |
||||||
|
register_change_wp_by_status(); |
||||||
|
} |
||||||
|
}); |
||||||
|
}; |
||||||
|
|
||||||
|
$('document').ready(function () { |
||||||
|
if (applicable()) { |
||||||
|
init(); |
||||||
|
} |
||||||
|
}); |
||||||
|
})(jQuery); |
@ -1,67 +0,0 @@ |
|||||||
<%#-- copyright |
|
||||||
OpenProject is a project management system. |
|
||||||
Copyright (C) 2012-2013 the OpenProject Foundation (OPF) |
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or |
|
||||||
modify it under the terms of the GNU General Public License version 3. |
|
||||||
|
|
||||||
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
|
||||||
Copyright (C) 2006-2013 Jean-Philippe Lang |
|
||||||
Copyright (C) 2010-2013 the ChiliProject Team |
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or |
|
||||||
modify it under the terms of the GNU General Public License |
|
||||||
as published by the Free Software Foundation; either version 2 |
|
||||||
of the License, or (at your option) any later version. |
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU General Public License for more details. |
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License |
|
||||||
along with this program; if not, write to the Free Software |
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
||||||
|
|
||||||
See doc/COPYRIGHT.rdoc for more details. |
|
||||||
|
|
||||||
++#%> |
|
||||||
|
|
||||||
<form id="status_by_form"> |
|
||||||
<fieldset> |
|
||||||
<legend> |
|
||||||
<% update_form = remote_function(:url => status_by_version_path(version), |
|
||||||
:with => "Form.serialize('status_by_form')", |
|
||||||
:method => :get) %> |
|
||||||
|
|
||||||
<%= l(:label_issues_by, |
|
||||||
select_tag('status_by', |
|
||||||
status_by_options_for_select(criteria), |
|
||||||
:id => 'status_by_select', |
|
||||||
:onchange => update_form)).html_safe %> |
|
||||||
</legend> |
|
||||||
<% if counts.empty? %> |
|
||||||
<p><em><%= l(:label_no_data) %></em></p> |
|
||||||
<% else %> |
|
||||||
<table> |
|
||||||
<% counts.each do |count| %> |
|
||||||
<tr> |
|
||||||
<td width="130px" align="right" > |
|
||||||
<%= link_to h(count[:group]), {controller: :work_packages, |
|
||||||
action: :index, |
|
||||||
project_id: version.project, |
|
||||||
set_filter: 1, |
|
||||||
status_id: '*', |
|
||||||
fixed_version_id: version}.merge("#{criteria}_id".to_sym => count[:group]) %> |
|
||||||
</td> |
|
||||||
<td width="240px"> |
|
||||||
<%= progress_bar((count[:closed].to_f / count[:total])*100, |
|
||||||
:legend => "#{count[:closed]}/#{count[:total]}", |
|
||||||
:width => "#{(count[:total].to_f / max * 200).floor}px;") %> |
|
||||||
</td> |
|
||||||
</tr> |
|
||||||
<% end %> |
|
||||||
</table> |
|
||||||
<% end %> |
|
||||||
</fieldset> |
|
||||||
</form> |
|
@ -0,0 +1,76 @@ |
|||||||
|
<%#-- copyright |
||||||
|
OpenProject is a project management system. |
||||||
|
Copyright (C) 2012-2013 the OpenProject Foundation (OPF) |
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or |
||||||
|
modify it under the terms of the GNU General Public License version 3. |
||||||
|
|
||||||
|
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||||
|
Copyright (C) 2006-2013 Jean-Philippe Lang |
||||||
|
Copyright (C) 2010-2013 the ChiliProject Team |
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or |
||||||
|
modify it under the terms of the GNU General Public License |
||||||
|
as published by the Free Software Foundation; either version 2 |
||||||
|
of the License, or (at your option) any later version. |
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful, |
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
GNU General Public License for more details. |
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License |
||||||
|
along with this program; if not, write to the Free Software |
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
|
||||||
|
See doc/COPYRIGHT.rdoc for more details. |
||||||
|
|
||||||
|
++#%> |
||||||
|
<% tag_for_selection = select_tag('status_by', |
||||||
|
status_by_options_for_select(criteria), |
||||||
|
:id => 'status_by_select') %> |
||||||
|
|
||||||
|
<%= form_tag status_by_version_path(version), |
||||||
|
:id => "status_by_form" do %> |
||||||
|
|
||||||
|
<fieldset> |
||||||
|
|
||||||
|
<legend> |
||||||
|
<%= l(:label_work_packages_by, tag_for_selection).html_safe %> |
||||||
|
</legend> |
||||||
|
|
||||||
|
<% if counts.empty? %> |
||||||
|
|
||||||
|
<p> |
||||||
|
<em><%= l(:label_no_data) %></em> |
||||||
|
</p> |
||||||
|
|
||||||
|
<% else %> |
||||||
|
|
||||||
|
<table> |
||||||
|
|
||||||
|
<% counts.each do |count| %> |
||||||
|
|
||||||
|
<tr> |
||||||
|
<td width="130px" align="right" > |
||||||
|
<%= link_to h(count[:group]), {controller: :work_packages, |
||||||
|
action: :index, |
||||||
|
project_id: version.project, |
||||||
|
set_filter: 1, |
||||||
|
status_id: '*', |
||||||
|
fixed_version_id: version}.merge("#{criteria}_id".to_sym => count[:group]) %> |
||||||
|
</td> |
||||||
|
<td width="240px"> |
||||||
|
<%= progress_bar((count[:closed].to_f / count[:total])*100, |
||||||
|
:legend => "#{count[:closed]}/#{count[:total]}", |
||||||
|
:width => "#{(count[:total].to_f / max * 200).floor}px;") %> |
||||||
|
</td> |
||||||
|
</tr> |
||||||
|
|
||||||
|
<% end %> |
||||||
|
|
||||||
|
</table> |
||||||
|
|
||||||
|
<% end %> |
||||||
|
</fieldset> |
||||||
|
<% end %> |
Loading…
Reference in new issue