vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

bug 45485 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@986 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2010-10-13 18:15:57 +00:00
parent 8503edbe86
commit 85a7e10cdc
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scrum.cgi
View File

@ -7,13 +7,14 @@ use Bugzilla::Util qw(trim);
use Bugzilla::Error;
my $cgi = Bugzilla->cgi;
my $user = Bugzilla->login;
my $args = $cgi->Vars;
my $vars = {};
# $l = Layout parameters
my $l = {
cols => int($args->{t_cols}) > 0 ? int($args->{t_cols}) : undef,
rows => int($args->{t_rows}) > 0 ? int($args->{t_rows}) : undef,
cols => int($args->{t_cols} || 0) > 0 ? int($args->{t_cols} || 0) : undef,
rows => int($args->{t_rows} || 0) > 0 ? int($args->{t_rows} || 0) : undef,
fs => 12,
pw => 20,
ph => 25.2,
@ -31,7 +32,7 @@ my $l = {
for (qw(pw ph cw ch cmt cmr cmb cml fs pmt pmr pmb pml))
{
$l->{$_} = $1 if $args->{"t_$_"} =~ /^([\d\.]+)$/ && $1 >= 0;
$l->{$_} = $1 if defined $args->{"t_$_"} && $args->{"t_$_"} =~ /^([\d\.]+)$/ && $1 >= 0;
}
my ($pw, $ph) = ($l->{pw} - $l->{pml} - $l->{pmr}, $l->{ph} - $l->{pmt} - $l->{pmb});
@ -60,13 +61,23 @@ my $bugs = [];
my $est = {};
if ($args->{id})
{
push @$bugs, split /,/, $args->{id};
push @$bugs, split /,/, $args->{id}, -1;
for (@$bugs)
{
if ($_)
{
$_ = Bugzilla::Bug->new($_);
if (!$_->{error})
}
}
for (@$bugs)
{
if ($_ && !$_->{error})
{
if (!$user->can_see_bug($_))
{
$_ = bless { bug_id => $_->bug_id, error => 'AccessDenied' }, 'Bugzilla::Bug';
}
else
{
$est->{$_->bug_id} = 0+$_->estimated_time;
}
@ -104,7 +115,7 @@ for (@$bugs)
$vars->{pages} = $pages;
$vars->{t} = $l;
$vars->{idlist} = join ',', map { $_ && $_->id } @$bugs;
$vars->{idlist} = join ',', map { $_ && $_->id ? $_->id : "" } @$bugs;
$vars->{idlist_js} = join ',', map { $_ && $_->id ? $_->id : "''" } @$bugs;
$vars->{estimates} = $est;

16
template/en/custom/scrum/cards.html.tmpl
View File

@ -4,7 +4,7 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>[% terms.Bug %] List[% IF searchname || defaultsavename %][% ": " _ (searchname || defaultsavename) | html %][% END %]</title>
<title>Печать SCRUM-карточек[% IF searchname || defaultsavename %][% ": " _ (searchname || defaultsavename) | html %][% END %]</title>
<link rel="stylesheet" type="text/css" media="print" href="skins/standard/print.css" />
<script language="JavaScript" type="text/javascript" src="js/yui/yahoo-dom-event.js"></script>
<style type="text/css">
@ -99,7 +99,7 @@ x
<p style="clear: both"><input type="submit" value=" Показать " /> <input type="button" value=" Удалить все карточки " onclick="deleteAllCards()" /> </p>
<p>
Добавить баги: <input type="text" id="addbugs" value="" /> <input type="button" value=" Добавить " onclick="addNewCards()" /> (в конец списка)
Добавить баги: <input type="text" id="addbugs" value="" /> <input type="button" value=" Добавить " onclick="addNewCards()" /> <input type="button" value=" Добавить пустой лист " onclick="addEmptyPage()" /> (в конец списка)
</p>
<div id="btn_delete" style="float: left; border: 2px outset #b0b0b0; padding: 3px; background-color: #f0f0f0">
@ -195,6 +195,14 @@ function addNewCards()
document.getElementById('idlist_value').value = idlist.join(',');
document.getElementById('scrumform').submit();
}
function addEmptyPage()
{
for (var i = 0; i < nr*nc; i++)
idlist.push('');
document.getElementById('idlist_value').value = idlist.join(',');
document.writeln(idlist.join(','));
document.getElementById('scrumform').submit();
}
function addNewIfEnter(ev, target)
{
if (ev.keyCode == 10 || ev.keyCode == 13)
@ -372,14 +380,16 @@ function doPasteCards(coord)
from = to_coord(i);
to = to_coord(i+nx);
document.getElementById('card_'+to[0]+'_'+to[1]+'_'+to[2]).innerHTML =
document.getElementById('card_'+from[0]+'_'+from[1]+'_'+from[2]).innerHTML;
document.getElementById('card_'+from[0]+'_'+from[1]+'_'+from[2]).innerHTML;
idlist[i+nx] = idlist[i];
}
for (var i = 0; i < nx; i++)
{
to = to_coord(i+coord);
document.getElementById('card_'+to[0]+'_'+to[1]+'_'+to[2]).innerHTML = cuttedcards[i];
document.getElementById('cardtd_'+to[0]+'_'+to[1]+'_'+to[2]).className = 'cardtd selected';
idlist[i+coord] = cuttedids[i];
selectedcards[to[0]+'_'+to[1]+'_'+to[2]] = true;
}
cuttedids = [];
cuttedcards = [];