From: Frédéric Buclin Date: Mon, 6 Jan 2014 23:29:51 +0000 (+0100) Subject: Merge trunk at revision 8851 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c85a4be499233ba5e34071e8c036bd34a781ff27;p=thirdparty%2Fbugzilla.git Merge trunk at revision 8851 --- c85a4be499233ba5e34071e8c036bd34a781ff27 diff --cc Bugzilla/Field.pm index f865c49296,82c82161af..5437395a79 --- a/Bugzilla/Field.pm +++ b/Bugzilla/Field.pm @@@ -248,8 -253,9 +253,10 @@@ use constant DEFAULT_FIELDS => {name => "owner_idle_time", desc => "Time Since Assignee Touched"}, {name => 'see_also', desc => "See Also", type => FIELD_TYPE_BUG_URLS}, - {name => 'tag', desc => 'Tags', buglist => 1}, + {name => 'tag', desc => 'Tags', buglist => 1, + type => FIELD_TYPE_KEYWORDS}, + {name => 'comment_tag', desc => 'Comment Tag'}, + {name => 'master_bug_id', desc => 'Master Bug ID'}, ); ################ diff --cc Bugzilla/Install/DB.pm index bc3bd90928,a463fe8791..5c2d249536 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@@ -666,9 -672,48 +672,51 @@@ sub update_table_definitions $dbh->bz_alter_column('products', 'defaultmilestone', {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"}); + # 2012-04-15 Frank@Frank-Becker.de - Bug 740536 + $dbh->bz_add_index('audit_log', 'audit_log_class_idx', ['class', 'at_time']); + + # 2012-06-06 dkl@mozilla.com - Bug 762288 + $dbh->bz_alter_column('bugs_activity', 'removed', + { TYPE => 'varchar(255)' }); + $dbh->bz_add_index('bugs_activity', 'bugs_activity_removed_idx', ['removed']); + + # 2012-06-13 dkl@mozilla.com - Bug 764457 + $dbh->bz_add_column('bugs_activity', 'id', + {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); + + # 2012-06-13 dkl@mozilla.com - Bug 764466 + $dbh->bz_add_column('profiles_activity', 'id', + {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); + + # 2012-07-24 dkl@mozilla.com - Bug 776972 + $dbh->bz_alter_column('bugs_activity', 'id', + {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); + + + # 2012-07-24 dkl@mozilla.com - Bug 776982 + _fix_longdescs_primary_key(); + + # 2012-08-02 dkl@mozilla.com - Bug 756953 + _fix_dependencies_dupes(); + + # 2012-08-01 koosha.khajeh@gmail.com - Bug 187753 + _shorten_long_quips(); + + # 2012-12-29 reed@reedloden.com - Bug 785283 + _add_password_salt_separator(); + + # 2013-01-02 LpSolit@gmail.com - Bug 824361 + _fix_longdescs_indexes(); + + # 2013-02-04 dkl@mozilla.com - Bug 824346 + _fix_flagclusions_indexes(); + + # 2013-08-26 sgreen@redhat.com - Bug 903895 + _fix_components_primary_key(); + + # 2011-08-29 rowebb@gmail.com - Bug 679547 + $dbh->bz_add_column('bugs', 'master_bug_id', {TYPE => 'INT3'}); + ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ diff --cc Bugzilla/WebService/Bug.pm index e8de777dc1,de78530926..0396fd4a37 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@@ -2063,9 -2689,10 +2703,13 @@@ and all custom fields =item The C item was added to the C return value in Bugzilla B<4.4>. + =item REST API call added in Bugzilla B<5.0>. + + =item In Bugzilla B<5.0>, the following items were added to the bugs return value: C, C, C. + +=item In Bugzilla B<5.0> C and C were added to +the C return value. + =back =back diff --cc skins/standard/global.css index 9815bae511,cf4fe57bf6..ce5d0f31e3 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@@ -398,31 -471,27 +471,35 @@@ dl dl > dt font-size: 150%; } -/* Style of the attachment table and time tracking table */ -#attachment_table { +/* Style of the attachment table, sightings table and time tracking table */ +#attachment_table, #sighting_table { border-collapse: collapse; border: 1px solid #333333; + margin: 2ex 0; } - #attachment_table th, .bz_attach_footer, .bz_sighting_table th, - .bz_sighting_footer, .bz_time_tracking_table th { + #attachment_table th, .bz_attach_footer, .bz_time_tracking_table th, -.dependency_tree_controls { ++.dependency_tree_controls, .bz_sighting_table th, .bz_sighting_footer { background-color: #E0E0E0; color: black; + padding: 0.5em; } -#attachment_table td, .bz_time_tracking_table th, .bz_time_tracking_table td { +#attachment_table td, .bz_sighting_table th, .bz_sighting_table td, +.bz_time_tracking_table th, .bz_time_tracking_table td { border: 1px solid #333333; + padding: 0.5em; +} + +#sighting_table td { + text-align: center; } - .bz_attach_extra_info { + #attachment_table th, #attachment_table td { + padding: 0.3em; + } + + .bz_attach_extra_info, .bz_info { font-size: smaller; } diff --cc template/en/default/bug/edit.html.tmpl index 3970da83bc,3b93ebe2be..1fd8ee0a95 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@@ -116,14 -143,9 +143,15 @@@ - +
+ - +
+ [%# *** Sightings *** %] + + [% PROCESS sighting/list.html.tmpl + bug = bug + %] + [% IF user.is_timetracker %] [% PROCESS section_timetracking %] [% END %] @@@ -305,12 -321,18 +327,12 @@@ [% BLOCK section_status %]
- Status: - + Status: + - [% display_value("bug_status", bug.bug_status) FILTER html %] - [% IF bug.resolution %] - [%+ display_value("resolution", bug.resolution) FILTER html %] - [% IF bug.dup_id %] - of [% "${terms.bug} ${bug.dup_id}" FILTER bug_link(bug.dup_id) FILTER none %] - [% END %] - [% END %] + [% PROCESS bug/status.html.tmpl target = bug %] [% IF bug.user.canedit || bug.user.isreporter %] (edit) diff --cc template/en/default/global/field-descs.none.tmpl index 1a786e310b,34c4dc9eda..7de20397d8 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@@ -117,9 -120,9 +120,10 @@@ "setting" => "Setting", "settings" => "Settings", "short_desc" => "Summary", + "short_short_desc" => "Summary", + "sighting" => "Sighting", "status_whiteboard" => "Whiteboard", - "tag.name" => "Tags", + "tag" => "Tags", "target_milestone" => "Target Milestone", "version" => "Version", "work_time" => "Hours Worked",