From 898e5ab5f292d8d0d72ae0aa9fc6d4638e5d6eca Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 1 Oct 2011 13:22:13 +0200 Subject: Bug 582529: Ambiguous error message "You did not specify a file to attach" when deleting an existing attachment filename a=LpSolit --- Bugzilla/Attachment.pm | 9 ++++++++- template/en/default/global/user-error.html.tmpl | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index a39dc3af4..3a8e7d5d5 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -565,7 +565,14 @@ sub _check_filename { my ($invocant, $filename) = @_; $filename = clean_text($filename); - $filename || ThrowUserError('file_not_specified'); + if (!$filename) { + if (ref $invocant) { + ThrowUserError('filename_not_specified'); + } + else { + ThrowUserError('file_not_specified'); + } + } # Remove path info (if any) from the file name. The browser should do this # for us, but some are buggy. This may not work on Mac file names and could diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 35640b220..265a061d1 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -599,6 +599,10 @@ [% title = "No File Specified" %] You did not specify a file to attach. + [% ELSIF error == "filename_not_specified" %] + [% title = "No Filename Specified" %] + You must specify a filename for this attachment. + [% ELSIF error == "file_too_large" %] [% title = "File Too Large" %] [%# Convert maxlocalattachment from Mb to Kb %] -- cgit v1.2.3-24-g4f1b From a8e875973a29772c28b149baa754cbaf4d2aaee7 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Mon, 3 Oct 2011 00:57:07 +0200 Subject: Bug 615636: Labels are badly aligned when editing versions and milestones in admin pages r/a=LpSolit --- .../en/default/admin/components/edit-common.html.tmpl | 15 +++++++-------- template/en/default/admin/components/edit.html.tmpl | 4 ++-- template/en/default/admin/milestones/edit.html.tmpl | 6 +++--- template/en/default/admin/versions/edit.html.tmpl | 4 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl index 069b56cfd..3e489af74 100644 --- a/template/en/default/admin/components/edit-common.html.tmpl +++ b/template/en/default/admin/components/edit-common.html.tmpl @@ -23,15 +23,16 @@ #%] - Component: - + - Component Description: + [% INCLUDE global/textarea.html.tmpl name = 'description' + id = 'description' minrows = 4 cols = 64 wrap = 'virtual' @@ -40,7 +41,7 @@ - + [% INCLUDE global/userselect.html.tmpl name => "initialowner" @@ -52,7 +53,7 @@ [% IF Param('useqacontact') %] - + [% INCLUDE global/userselect.html.tmpl name => "initialqacontact" @@ -65,9 +66,7 @@ [% END %] - - - + [% INCLUDE global/userselect.html.tmpl name => "initialcc" diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index b5fc3c321..5236186cc 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -43,12 +43,12 @@ [% PROCESS "admin/components/edit-common.html.tmpl" %] - + - [% terms.Bugs %]: + [% terms.Bugs %]: [% IF comp.bug_count > 0 %] - + - + - + diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl index 1de233567..497d67e2e 100644 --- a/template/en/default/admin/versions/edit.html.tmpl +++ b/template/en/default/admin/versions/edit.html.tmpl @@ -37,12 +37,12 @@ - + - + -- cgit v1.2.3-24-g4f1b From 763a930131864bedd3155b668fcd8fd0fce2fefc Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 4 Oct 2011 23:38:17 +0200 Subject: $user->is_mover no longer exists, see bug 556422 --- Bugzilla/User.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index ea186a0fd..48ce41a57 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -2488,12 +2488,6 @@ Returns true if the user wants mail for a given set of events. This method is more general than C, allowing you to check e.g. permissions for flag mail. -=item C - -Returns true if the user is in the list of users allowed to move bugs -to another database. Note that this method doesn't check whether bug -moving is enabled. - =item C Returns true if the user can access private comments and attachments, -- cgit v1.2.3-24-g4f1b