diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-08-13 16:31:02 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-08-13 16:31:02 +0200 |
| commit | 96c78287563baa489c5ad36c855c63674ed55b34 (patch) | |
| tree | 989ff5b4d962e9ab93f7da8d00d7b7940456101d /extensions/TrackingFlags/lib/Admin.pm | |
| parent | 40a58eeefe8d4b754b5201415b8062047119bd1a (diff) | |
| download | bugzilla-96c78287563baa489c5ad36c855c63674ed55b34.tar.gz bugzilla-96c78287563baa489c5ad36c855c63674ed55b34.tar.xz | |
Bug 899091 - SENTRY ERROR: Can't locate object method "cf_partner_koi_tcl" via package "Bugzilla::Bug" at /loader/0x7f88f01cfd60/Bugzilla/Extension/Push/Serialise.pm line 217
r=glob
Diffstat (limited to 'extensions/TrackingFlags/lib/Admin.pm')
| -rw-r--r-- | extensions/TrackingFlags/lib/Admin.pm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/extensions/TrackingFlags/lib/Admin.pm b/extensions/TrackingFlags/lib/Admin.pm index 9e8b33b43..3529d30a7 100644 --- a/extensions/TrackingFlags/lib/Admin.pm +++ b/extensions/TrackingFlags/lib/Admin.pm @@ -55,8 +55,15 @@ sub admin_edit { || ThrowCodeError('tracking_flags_invalid_item_id', { item => 'flag', id => $vars->{flag_id} }); $flag->remove_from_db(); - $vars->{mode} = 'deleted'; - $vars->{flag_name} = $flag->name; + $vars->{message} = 'tracking_flag_deleted'; + $vars->{flag} = $flag; + $vars->{flags} = [ Bugzilla::Extension::TrackingFlags::Flag->get_all() ]; + + print Bugzilla->cgi->header; + my $template = Bugzilla->template; + $template->process('pages/tracking_flags_admin_list.html.tmpl', $vars) + || ThrowTemplateError($template->error()); + exit; } elsif ($input->{save}) { # save @@ -68,12 +75,12 @@ sub admin_edit { $vars->{flag} = $flag_obj; $vars->{values} = _flag_values_to_json($values); $vars->{visibility} = _flag_visibility_to_json($visibilities); - $vars->{can_delete} = !$flag_obj->has_values; + $vars->{can_delete} = !$flag_obj->has_bug_values; if ($vars->{mode} eq 'new') { - $vars->{message} = 'tracking_flags_created'; + $vars->{message} = 'tracking_flag_created'; } else { - $vars->{message} = 'tracking_flags_updated'; + $vars->{message} = 'tracking_flag_updated'; } } else { @@ -86,7 +93,7 @@ sub admin_edit { $vars->{flag} = $flag; $vars->{values} = _flag_values_to_json($flag->values); $vars->{visibility} = _flag_visibility_to_json($flag->visibility); - $vars->{can_delete} = !$flag->has_values; + $vars->{can_delete} = !$flag->has_bug_values; } elsif ($vars->{mode} eq 'copy') { # copy - load the source flag |