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

Fix flag type editing error

3col
Vitaliy Filippov 2015-09-14 14:10:39 +03:00
parent 6e309990a6
commit 756d0d5fb2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editflagtypes.cgi
View File

@ -265,13 +265,14 @@ sub processCategoryChange
my @groups = Bugzilla::Group->get_all;
$vars->{groups} = \@groups;
$vars->{action} = $ARGS->{action};
$vars->{last_action} = $ARGS->{action} eq 'update' ? 'edit' : $ARGS->{action};
my $type = {};
foreach my $key (keys %$ARGS)
{
$type->{$key} = $ARGS->{$key};
}
# That's what I call a big hack. The template expects to see a group object.
# FIXME That's what I call a big hack. The template expects to see a flag type object.
# This script needs some rewrite anyway.
$type->{grant_group} = {};
$type->{grant_group}->{name} = $ARGS->{grant_group};

8
template/en/default/admin/flag-type/edit.html.tmpl
View File

@ -149,7 +149,7 @@
<th>&nbsp;</th>
<td>
<input type="checkbox" id="is_active" name="is_active"
[% ' checked="checked"' IF type.is_active || !type.is_active.defined %] />
[% ' checked="checked"' IF type.is_active %] />
<label for="is_active">active (flags of this type appear in the UI and can be set)</label>
</td>
</tr>
@ -158,7 +158,7 @@
<th>&nbsp;</th>
<td>
<input type="checkbox" id="is_requestable" name="is_requestable"
[% ' checked="checked"' IF type.is_requestable || !type.is_requestable.defined %] />
[% ' checked="checked"' IF type.is_requestable %] />
<label for="is_requestable">requestable (users can ask for flags of this type to be set)</label>
</td>
</tr>
@ -182,7 +182,7 @@
<th>&nbsp;</th>
<td>
<input type="checkbox" id="is_requesteeble" name="is_requesteeble"
[% ' checked="checked"' IF type.is_requesteeble || !type.is_requesteeble.defined %] />
[% ' checked="checked"' IF type.is_requesteeble %] />
<label for="is_requesteeble">specifically requestable (users can ask specific other users
to set flags of this type as opposed to just asking the wind)</label>
</td>
@ -192,7 +192,7 @@
<th>&nbsp;</th>
<td>
<input type="checkbox" id="is_multiplicable" name="is_multiplicable"
[% ' checked="checked"' IF type.is_multiplicable || !type.is_multiplicable.defined %] />
[% ' checked="checked"' IF type.is_multiplicable %] />
<label for="is_multiplicable">multiplicable (multiple flags of this type can be set on
the same [% typeLabelLowerSingular %])</label>
</td>