Commit: 963b7611442cb262229187e8ddc0f42fd83b5f63 Author: mano-wii Date: Fri Jul 26 11:19:21 2019 -0300 Branches: master https://developer.blender.org/rB963b7611442cb262229187e8ddc0f42fd83b5f63
WM: Pre-fill bug-reports for addons This is an increment of the proposed changes in D4507. Differential Revision: https://developer.blender.org/D5303 =================================================================== M release/scripts/modules/bl_ui_utils/bug_report_url.py M release/scripts/startup/bl_ui/space_userpref.py =================================================================== diff --git a/release/scripts/modules/bl_ui_utils/bug_report_url.py b/release/scripts/modules/bl_ui_utils/bug_report_url.py index 510ea5d7e57..33eeb1c278d 100644 --- a/release/scripts/modules/bl_ui_utils/bug_report_url.py +++ b/release/scripts/modules/bl_ui_utils/bug_report_url.py @@ -18,7 +18,7 @@ # <pep8-80 compliant> -def url_prefill_from_blender(): +def url_prefill_from_blender(addon_info = None): import bpy import bgl import struct @@ -44,7 +44,7 @@ def url_prefill_from_blender(): ) fh.write( "\n" - "\n**Blender Version**\n" + "**Blender Version**\n" ) fh.write( "Broken: version: {!s}, branch: {!s}, commit date: {!s} {!s}, hash: `rB{!s}`\n".format( @@ -57,7 +57,18 @@ def url_prefill_from_blender(): ) fh.write( "Worked: (optional)\n" - "\n" + ) + if addon_info: + fh.write( + "\n" + "**Addon Information**\n" + ) + fh.write(( + "Name: {name} {version}\n" + "Author: {author}\n").format(**addon_info) + ) + + fh.write( "\n" "**Short description of error**\n" "[Please fill out a short description of the error here]\n" @@ -70,7 +81,8 @@ def url_prefill_from_blender(): fh.seek(0) + form_number = 2 if addon_info else 1 return ( - "https://developer.blender.org/maniphest/task/edit/form/1?description="; + + "https://developer.blender.org/maniphest/task/edit/form/%i?description="; % form_number + urllib.parse.quote(fh.read()) ) diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 02d9f797581..6a18766fae2 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1700,6 +1700,7 @@ class USERPREF_PT_addons(Panel): def draw(self, context): import os import addon_utils + from bl_ui_utils.bug_report_url import url_prefill_from_blender layout = self.layout @@ -1879,7 +1880,7 @@ class USERPREF_PT_addons(Panel): "wm.url_open", text="Report a Bug", icon='URL', ).url = info.get( "tracker_url", - "https://developer.blender.org/maniphest/task/edit/form/2";, + url_prefill_from_blender(info), ) if user_addon: sub.operator( _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
