diff options
| -rw-r--r-- | .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/18062060-68e2-4afc-a493-7498c53fe2a6/values | 17 | ||||
| -rw-r--r-- | .be/id-cache | 17 | ||||
| -rw-r--r-- | data/lib/bzpage.js | 12 | ||||
| -rw-r--r-- | data/lib/logging-front.js | 4 | ||||
| -rw-r--r-- | jsons/Config_mozilla.json | 133 | ||||
| -rw-r--r-- | lib/libbugzilla.js | 17 | ||||
| -rw-r--r-- | lib/main.js | 33 |
7 files changed, 127 insertions, 106 deletions
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/18062060-68e2-4afc-a493-7498c53fe2a6/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/18062060-68e2-4afc-a493-7498c53fe2a6/values new file mode 100644 index 0000000..7721b7e --- /dev/null +++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/18062060-68e2-4afc-a493-7498c53fe2a6/values @@ -0,0 +1,17 @@ +creator: Matěj Cepl <mcepl@redhat.com> + + +reporter: Matěj Cepl <mcepl@redhat.com> + + +severity: minor + + +status: open + + +summary: TimeSheet operations should be conditional + + +time: Wed, 02 Mar 2011 19:33:00 +0000 + diff --git a/.be/id-cache b/.be/id-cache index 807ce47..023fb4b 100644 --- a/.be/id-cache +++ b/.be/id-cache @@ -1,29 +1,30 @@ 829f5222-d220-4406-90da-835b72b70a97 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/829f5222-d220-4406-90da-835b72b70a97 c81c6f54-62b8-471f-92b0-d67c5aa23bc1 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/c81c6f54-62b8-471f-92b0-d67c5aa23bc1 -020d417e-bb74-4a80-a7b5-9f858bb93994 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/020d417e-bb74-4a80-a7b5-9f858bb93994 +8ac83c34-a735-47f1-82ec-3731fda5a176 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/8ac83c34-a735-47f1-82ec-3731fda5a176 ba22934d-f4f1-42ce-95f5-c56394a83ccc .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc ecff7ddb-1d5f-406b-9b3b-18388d575604 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/ecff7ddb-1d5f-406b-9b3b-18388d575604 -11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4/comments/11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef +d4145155-0ef1-409e-9236-261eb08f75d5 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5 +18062060-68e2-4afc-a493-7498c53fe2a6 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/18062060-68e2-4afc-a493-7498c53fe2a6 12d5c683-231b-4b4f-8f05-b6ae32a5b0a8 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/e16d92aa-df09-4851-b6a0-3ed0ea2ff0fa/comments/12d5c683-231b-4b4f-8f05-b6ae32a5b0a8 476bde43-fa24-445f-a79e-b3d251bc515a .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/476bde43-fa24-445f-a79e-b3d251bc515a 29f5f313-559a-4fea-88fa-fc4a4fc94112 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5fc172f0-231a-4d0e-9c6b-8d9f60abbfba/comments/29f5f313-559a-4fea-88fa-fc4a4fc94112 -d4145155-0ef1-409e-9236-261eb08f75d5 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5 +11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4/comments/11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef 5fc172f0-231a-4d0e-9c6b-8d9f60abbfba .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5fc172f0-231a-4d0e-9c6b-8d9f60abbfba d315d824-bb0d-4a28-941d-88a1aa77ffa0 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d315d824-bb0d-4a28-941d-88a1aa77ffa0 88fa923c-59ee-47bf-b7c8-d1a7a7bdeb33 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/88fa923c-59ee-47bf-b7c8-d1a7a7bdeb33 f7ecb466-c223-40c7-a44b-6e1f8f5c6df4 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/f7ecb466-c223-40c7-a44b-6e1f8f5c6df4 -1f79f761-75f5-469e-a7fa-44e0d3368c03 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/8ac83c34-a735-47f1-82ec-3731fda5a176/comments/1f79f761-75f5-469e-a7fa-44e0d3368c03 -8ac83c34-a735-47f1-82ec-3731fda5a176 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/8ac83c34-a735-47f1-82ec-3731fda5a176 +5718cbae-15da-4921-8371-5be69197c4ed .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed +020d417e-bb74-4a80-a7b5-9f858bb93994 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/020d417e-bb74-4a80-a7b5-9f858bb93994 a9d5d16d-1c7d-4918-8be2-bd499a799b54 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/989f85c8-3941-4a97-a447-bdbf0fbbd7f4/comments/a9d5d16d-1c7d-4918-8be2-bd499a799b54 9ba533b6-61b6-437a-b4b6-be12aae025e5 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/9ba533b6-61b6-437a-b4b6-be12aae025e5 ca8df3f8-7557-4730-bcca-3707776f5db4 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4 b9e11546-5ec7-4464-8070-35c5510c13ff .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5/comments/b9e11546-5ec7-4464-8070-35c5510c13ff fcebd19c-12b9-43ae-bc54-7cae39396e9f .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/fcebd19c-12b9-43ae-bc54-7cae39396e9f 99abb100-a0e8-49b0-8799-a47e4d5fb0b3 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/99abb100-a0e8-49b0-8799-a47e4d5fb0b3 -27c176c2-26be-4a51-bb71-2aff47c5484b .be/27c176c2-26be-4a51-bb71-2aff47c5484b -5718cbae-15da-4921-8371-5be69197c4ed .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed -62c92ec0-678a-4834-ad69-76aff18e2227 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227 bd5cef03-c389-4fab-8336-30a02ee97261 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/bd5cef03-c389-4fab-8336-30a02ee97261 +1f79f761-75f5-469e-a7fa-44e0d3368c03 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/8ac83c34-a735-47f1-82ec-3731fda5a176/comments/1f79f761-75f5-469e-a7fa-44e0d3368c03 +62c92ec0-678a-4834-ad69-76aff18e2227 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227 +27c176c2-26be-4a51-bb71-2aff47c5484b .be/27c176c2-26be-4a51-bb71-2aff47c5484b 70b1e7f3-6446-45dc-91e5-e338d51770aa .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/99abb100-a0e8-49b0-8799-a47e4d5fb0b3/comments/70b1e7f3-6446-45dc-91e5-e338d51770aa fe5d2894-18a6-4864-b7e6-1eba7e300425 .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/fe5d2894-18a6-4864-b7e6-1eba7e300425 ad8fee41-b8dd-4c4e-85e1-4ab96923cecb .be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb diff --git a/data/lib/bzpage.js b/data/lib/bzpage.js index bd8e6ce..1a3e6b4 100644 --- a/data/lib/bzpage.js +++ b/data/lib/bzpage.js @@ -75,6 +75,7 @@ function centralCommandDispatch (cmdLabel, cmdParams) { console.log("centralCommandDispatch : cmdLabel = " + cmdLabel); switch (cmdLabel) { case "name": + case "position": break; case "resolution": case "product": @@ -248,22 +249,25 @@ function changeAssignee (newAssignee) { function addToCommentsDropdown (cmdObj) { var select = document.getElementById("comment_action"); if (!select) { + config.commandsList = []; document.getElementById("comments").innerHTML += "<div id='make_bugzilla_comment_action'>" + " <label for='comment_action'>Add Comment: </label>" + " <select id='comment_action'>" + " <option value=''>-- Select Comment from List --</option>" + + " </select>" + "</div>"; select = document.getElementById("comment_action"); select.addEventListener("change", function (evt) { var value = select.options[select.selectedIndex].value; - log("value = " + value); - executeCommand(value); + executeCommand(config.commandsList[value]); }, false); } var opt = document.createElement("option"); - opt.value = cmdObj; + var objIdx = config.commandsList.length + 1; + opt.value = objIdx; + config.commandsList[objIdx] = cmdObj; opt.textContent = cmdObj.name; select.appendChild(opt); } @@ -332,7 +336,7 @@ function generateButtons (pkgs, kNodes) { // ========================================================= if (kNodes && window.location.hostname in kNodes) { - var killConf = killNodes[window.location.hostname]; + var killConf = kNodes[window.location.hostname]; killNodes(document, killConf[0], killConf[1]); } diff --git a/data/lib/logging-front.js b/data/lib/logging-front.js index b3a175d..f6b3546 100644 --- a/data/lib/logging-front.js +++ b/data/lib/logging-front.js @@ -82,4 +82,6 @@ function setUpLogging () { */ } -setUpLogging(); +if (window.location.hostname == "bugzilla.redhat.com") { + setUpLogging(); +} diff --git a/jsons/Config_mozilla.json b/jsons/Config_mozilla.json index 2526e29..302bda9 100644 --- a/jsons/Config_mozilla.json +++ b/jsons/Config_mozilla.json @@ -1,92 +1,95 @@ { - "commentPackages":{ - "mozilla":{ - "safe-mode":{ - "name":"Safe Mode Question", - "position":"dropDown", - "comment":"Have you tried safe mode? (see https://support.mozillamessaging.com/en-US/kb/Safe+Mode for more information)" + "commentPackages": { + "mozilla": { + "safe-mode": { + "name": "Safe Mode Question", + "position": "dropDown", + "comment": "Have you tried safe mode? (see https://support.mozillamessaging.com/en-US/kb/Safe+Mode for more information)" }, - "extension-issue":{ - "name":"Response: Invalid due to extension issue", - "position":"dropDown", - "comment":"Sorry, your issue is to do with an extension and we are unable to support it here. Please raise the issue direct with the extension author or on their site.\n\nYou may find details of how to do this here:\n\n******* INSERT LINK TO EXTENSION SITE *******", - "status":"RESOLVED", - "resolution":"INVALID" + "extension-issue": { + "name": "Response: Invalid due to extension issue", + "position": "dropDown", + "comment": "Sorry, your issue is to do with an extension and we are unable to support it here. Please raise the issue direct with the extension author or on their site.\n\nYou may find details of how to do this here:\n\n******* INSERT LINK TO EXTENSION SITE *******", + "status": "RESOLVED", + "resolution": "INVALID" }, - "profile-location":{ - "name":"Profile Location text and link", - "position":"dropDown", - "comment":"To locate your profile, see this page for more information: https://support.mozillamessaging.com/en-US/kb/Profiles" + "profile-location": { + "name": "Profile Location text and link", + "position": "dropDown", + "comment": "To locate your profile, see this page for more information: https://support.mozillamessaging.com/en-US/kb/Profiles" }, - "no-response":{ - "name":"INCOMPLETE (No Response from Reporter)", - "position":"dropDown", - "comment":"No response for a while now, closing INCOMPLETE. Please reopen if you can reproduce or answer any unanswered questions.", - "status":"RESOLVED", - "resolution":"INCOMPLETE" + "no-response": { + "name": "INCOMPLETE (No Response from Reporter)", + "position": "dropDown", + "comment": "No response for a while now, closing INCOMPLETE. Please reopen if you can reproduce or answer any unanswered questions.", + "status": "RESOLVED", + "resolution": "INCOMPLETE" } }, - "thunderbird":{ + "thunderbird": { }, - "calendar":{ - "console-log":{ - "name":"Calendar Console Log", - "position":"dropDown", - "commentIdx":"consoleLogStr" + "calendar": { + "console-log": { + "name": "Calendar Console Log", + "position": "dropDown", + "commentIdx": "consoleLogStr" }, - "prepare-checkin":{ - "name":"prepare for checkin", - "position":"dropDown", - "target":"1.0b2", - "removeKeyword":"checkin-needed", - "status":"RESOLVED", - "resolution":"FIXED", - "comment":"Pushed to comm-central <http://hg.mozilla.org/comm-central/rev/INSERT_REV_HERE>\n\n-> FIXED" + "prepare-checkin": { + "name": "prepare for checkin", + "position": "dropDown", + "target": "1.0b2", + "removeKeyword": "checkin-needed", + "status": "RESOLVED", + "resolution": "FIXED", + "comment": "Pushed to comm-central <http://hg.mozilla.org/comm-central/rev/INSERT_REV_HERE>\n\n-> FIXED" }, - "what-version":{ - "name":"Using what version?", - "position":"dropDown", - "comment":"Please tell us what version you are using:\n\n* Thunderbird\n* Lightning\n* Provider for Google Calendar" + "what-version": { + "name": "Using what version?", + "position": "dropDown", + "comment": "Please tell us what version you are using:\n\n* Thunderbird\n* Lightning\n* Provider for Google Calendar" }, - "retest-nightly":{ - "name":"Retest with nightly", - "position":"dropDown", - "comment":"Does this still happen with the latest 1.0b2pre nightlies?" + "retest-nightly": { + "name": "Retest with nightly", + "position": "dropDown", + "comment": "Does this still happen with the latest 1.0b2pre nightlies?" }, - "extension-fodder":{ - "name":"Extension Fodder", - "position":"dropDown", - "addWhiteboard":"extension fodder", - "prefixSummary":"[extension fodder]", - "status":"RESOLVED", - "resolution":"WONTFIX", - "comment":"This sounds like a good idea, but I think it makes more sense as an extension. Marking WONTFIX for core calendar." + "extension-fodder": { + "name": "Extension Fodder", + "position": "dropDown", + "addWhiteboard": "extension fodder", + "prefixSummary": "[extension fodder]", + "status": "RESOLVED", + "resolution": "WONTFIX", + "comment": "This sounds like a good idea, but I think it makes more sense as an extension. Marking WONTFIX for core calendar." } } }, - "commentStrings":{ - "consoleLogStr":"Please enable calendar.debug.log and calendar.debug.log.verbose in the advanced config editor (Options > Advanced > General > Config Editor) and check your error console for messages." + "commentStrings": { + "consoleLogStr": "Please enable calendar.debug.log and calendar.debug.log.verbose in the advanced config editor (Options > Advanced > General > Config Editor) and check your error console for messages." }, - "configData":{ - "queryButton":true, - "upstreamButton":false, - "parseAbrtBacktraces":true, - "submitsLogging":false, - "suspiciousComponents":[ + "configData": { + "queryButton": true, + "upstreamButton": false, + "parseAbrtBacktraces": true, + "submitsLogging": false, + "suspiciousComponents": [ ], - "downloadJSON":[ + "enabledPackages": { + "bugzilla.mozilla.org": "all" + }, + "downloadJSON": [ ], - "objectStyle":"MoFo", - "matches":[ + "objectStyle": "MoFo", + "matches": [ "https://bugzilla.redhat.com/show_bug.cgi.*", "https://bugzilla.mozilla.org/show_bug.cgi.*" ], - "signature":"\n\n-- \nFedora Bugzappers volunteer triage team\nhttps://fedoraproject.org/wiki/BugZappers" + "signature": "" }, - "constantData":{ + "constantData": { } } diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js index bdcf8fb..9300c49 100644 --- a/lib/libbugzilla.js +++ b/lib/libbugzilla.js @@ -176,7 +176,8 @@ exports.getInstalledPackages = function getInstalledPackages(locationLoginObj, c } } - if ("sentUpstreamString" in config.gJSONData.commentStrings) { + if (config.gJSONData.commentStrings && + "sentUpstreamString" in config.gJSONData.commentStrings) { config.constantData.commentStrings = {}; config.constantData.commentStrings.sentUpstreamString = config.gJSONData.commentStrings["sentUpstreamString"]; @@ -326,25 +327,13 @@ exports.initialize = function initialize(config, callback) { }); } - // config.logger = new logger.Logger(JSON.parse( - // self.data.load("bugzillalabelAbbreviations.json"))); - config.configData = {}; config.configData.matches = config.gJSONData.configData.matches; config.configData.skipMatches = config.configData.matches.map(function(x) { return x.replace("show_bug.cgi.*","((process|post)_bug|attachment)\.cgi$"); }); - // config.objConstructor = {}; - // var bzType = config.gJSONData.configData.objectStyle; - // if (bzType === "RH") { - // config.objConstructor = require("rhbzpage").RHBugzillaPage; - // } else if (bzType === "MoFo") { - // } - // config.objConstructor = require("mozillabzpage").MozillaBugzilla; - config.constantData = {}; - // TODO this is important and missing if ("constantData" in config.gJSONData) { config.constantData = config.gJSONData.constantData; config.constantData.queryUpstreamBug = JSON.parse( @@ -375,8 +364,6 @@ exports.initialize = function initialize(config, callback) { if ("submitsLogging" in config.gJSONData.configData && config.gJSONData.configData.submitsLogging) { - console.log("initialize : submitsLogin = " + - config.gJSONData.configData.submitsLogging); logger.initialize(JSON.parse(selfMod.data.load( "bugzillalabelAbbreviations.json"))); } diff --git a/lib/main.js b/lib/main.js index 34feb32..b553f6f 100644 --- a/lib/main.js +++ b/lib/main.js @@ -111,24 +111,24 @@ var messageHandler = exports.messageHandler = function messageHandler(worker, ms } }; -var contentScriptLibraries = { - "bugzilla.redhat.com": [ - self.data.url("lib/jumpNextBug.js"), - self.data.url("lib/util.js"), - self.data.url("lib/color.js"), - self.data.url("lib/logging-front.js"), - self.data.url("lib/rhbzpage.js"), - self.data.url("lib/bzpage.js") - ] -}; +var contentScriptLibraries = [ + self.data.url("lib/jumpNextBug.js"), + self.data.url("lib/util.js"), + self.data.url("lib/color.js"), + self.data.url("lib/logging-front.js"), + self.data.url("lib/rhbzpage.js"), + self.data.url("lib/bzpage.js") +]; libbz.initialize(libbz.config, function () { pageMod.PageMod({ include: [ - "https://bugzilla.redhat.com/show_bug.cgi?id=*" + "https://bugzilla.redhat.com/show_bug.cgi?id=*", + "https://bugzilla.mozilla.org/show_bug.cgi?id=*", + "https://bugzilla.gnome.org/show_bug.cgi?id=*" ], contentScriptWhen: 'ready', - contentScriptFile: contentScriptLibraries["bugzilla.redhat.com"], + contentScriptFile: contentScriptLibraries, onAttach: function onAttach(worker, msg) { worker.on('message', function (msg) { messageHandler(worker, msg); @@ -140,7 +140,14 @@ libbz.initialize(libbz.config, function () { pageMod.PageMod({ include: [ "https://bugzilla.redhat.com/process_bug.cgi", - "https://bugzilla.redhat.com/attachment.cgi" + "https://bugzilla.redhat.com/post_bug.cgi", + "https://bugzilla.redhat.com/attachment.cgi", + "https://bugzilla.mozilla.org/process_bug.cgi", + "https://bugzilla.mozilla.org/post_bug.cgi", + "https://bugzilla.mozilla.org/attachment.cgi", + "https://bugzilla.gnome.org/process_bug.cgi", + "https://bugzilla.gnome.org/post_bug.cgi", + "https://bugzilla.gnome.org/attachment.cgi" ], contentScriptWhen: 'ready', contentScriptFile: self.data.url("lib/skip-bug.js") |