From 756d0d5fb28ba3c376c2b749b846e72c0995f541 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Mon, 14 Sep 2015 14:10:39 +0300
Subject: [PATCH] Fix flag type editing error

---
 editflagtypes.cgi                                  | 3 ++-
 template/en/default/admin/flag-type/edit.html.tmpl | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index d74619207..a50e206e8 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -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};
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 831f6d411..0d4f8e8e3 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -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>