hatohol-commit Mailing List for Project Hatohol
A unified manager of monitoring software
Status: Beta
Brought to you by:
makeinu
Menu
▾
▴
hatohol-commit — Commit mails
You can subscribe to this list here.
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(101) |
Aug
(519) |
Sep
(949) |
Oct
(997) |
Nov
(700) |
Dec
(849) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2014 |
Jan
(1113) |
Feb
(1014) |
Mar
(1012) |
Apr
(264) |
May
(450) |
Jun
(1443) |
Jul
(1465) |
Aug
(2083) |
Sep
(1778) |
Oct
(1654) |
Nov
(823) |
Dec
(1148) |
| 2015 |
Jan
(870) |
Feb
(2767) |
Mar
(1541) |
Apr
(246) |
May
(1505) |
Jun
(3010) |
Jul
(1021) |
Aug
(408) |
Sep
(748) |
Oct
(1269) |
Nov
(719) |
Dec
(836) |
| 2016 |
Jan
(849) |
Feb
(885) |
Mar
(784) |
Apr
(490) |
May
(286) |
Jun
(30) |
Jul
(72) |
Aug
(22) |
Sep
|
Oct
(16) |
Nov
(71) |
Dec
(420) |
| 2017 |
Jan
(172) |
Feb
(148) |
Mar
|
Apr
(16) |
May
(172) |
Jun
(98) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Travis CI <bu...@tr...> - 2017-07-03 02:26:08
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17589 Status: Still Failing Duration: 41 minutes and 46 seconds Commit: 6ac5456 (master) Author: Masayuki Nakagawa Message: Merge pull request #2559 from project-hatohol/change-jshint-to-eslint Change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/07f60f2cd3d6...6ac5456c5819 View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/249470730?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Masayuki N. <nul...@cl...> - 2017-07-03 01:41:21
|
Masayuki Nakagawa 2017-07-03 10:41:02 +0900 (Mon, 03 Jul 2017) New Revision: 6ac5456c581997c65dd50bc0f1de371faea0e36c https://github.com/project-hatohol/hatohol/commit/6ac5456c581997c65dd50bc0f1de371faea0e36c Message: Merge pull request #2559 from project-hatohol/change-jshint-to-eslint Change jshint to eslint |
|
From: Travis CI <bu...@tr...> - 2017-06-30 08:34:10
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17587 Status: Failed Duration: 41 minutes and 47 seconds Commit: 371f063 (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/84930121b106...371f0632255c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/248682541?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-30 06:53:56
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17585 Status: Canceled Duration: 22 minutes and 35 seconds Commit: 8493012 (change-jshint-to-eslint) Author: otakuto Message: a View the changeset: https://github.com/project-hatohol/hatohol/compare/371f0632255c...84930121b106 View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/248663193?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: otakuto <nul...@cl...> - 2017-06-30 06:30:31
|
otakuto 2017-06-30 15:30:01 +0900 (Fri, 30 Jun 2017) New Revision: 84930121b106f0bf95a9691c3acb28d71f2e5786 https://github.com/project-hatohol/hatohol/commit/84930121b106f0bf95a9691c3acb28d71f2e5786 Message: a Modified files: test/run-client-test.sh Modified: test/run-client-test.sh (+2 -1) =================================================================== --- test/run-client-test.sh 2017-06-14 15:51:47 +0900 (f9d936a) +++ test/run-client-test.sh 2017-06-30 15:30:01 +0900 (37a3340) @@ -12,6 +12,7 @@ ${TOP_DIR}/test/launch-hatohol-for-test.sh || exit 1 $(npm bin)/mocha-phantomjs http://localhost:8000/test/index.html || FAILED=1 # manage.py has a child process. We have to kill it too. cat $PIDS_FILE | awk '{ print "ps h -p " $1 " --ppid " $1 " -o pid" }' | sh | awk '{ print "kill " $1 }' | sh -npm run lint || FAILED=1 +npm run lint +echo $? exit $FAILED |
|
From: Travis CI <bu...@tr...> - 2017-06-30 06:00:35
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17584 Status: Canceled Duration: 27 minutes and 35 seconds Commit: adaeae8 (degrade-es) Author: otakuto Message: a View the changeset: https://github.com/project-hatohol/hatohol/commit/adaeae83b5f7 View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/248653592?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: otakuto <nul...@cl...> - 2017-06-30 05:32:40
|
otakuto 2017-06-30 14:32:05 +0900 (Fri, 30 Jun 2017) New Revision: adaeae83b5f7c95e38a457f906520a5ca60733ac https://github.com/project-hatohol/hatohol/commit/adaeae83b5f7c95e38a457f906520a5ca60733ac Message: a Modified files: client/static/js/actions_view.js client/static/js/graphs_view.js client/static/js/hatohol_hostgroup_privilege_edit_dialog.js client/static/js/hatohol_incident_trackers_editor.js client/static/js/hatohol_monitoring_view.js client/static/js/hatohol_privilege_edit_dialog.js client/static/js/hatohol_user_roles_editor.js client/static/js/incident_settings_view.js client/static/js/servers_view.js client/static/js/severity_ranks_view.js client/static/js/users_view.js Modified: client/static/js/actions_view.js (+19 -18) =================================================================== --- client/static/js/actions_view.js 2017-06-23 17:08:51 +0900 (a274635) +++ client/static/js/actions_view.js 2017-06-30 14:32:05 +0900 (0b85f91) @@ -187,9 +187,10 @@ var ActionsView = function(userProfile) { // function drawTableBody(actionsPkt) { - let s = ""; - for (let actionDef of actionsPkt["actions"]) + var s = ""; + for (var i = 0; i < actionsPkt["actions"].length; ++i) { + var actionDef = actionsPkt["actions"][i]; s += "<tr>"; s += "<td class='delete-selector' style='display:none;'>"; s += "<input type='checkbox' class='selectcheckbox' "; @@ -197,50 +198,50 @@ var ActionsView = function(userProfile) { s += "actionId='" + escapeHTML(actionDef.actionId) + "'></td>"; s += "<td>" + escapeHTML(actionDef.actionId) + "</td>"; - const nickName = getNickNameFromAction(actionsPkt, actionDef); + var nickName = getNickNameFromAction(actionsPkt, actionDef); s += "<td>" + escapeHTML(nickName) + "</td>"; - const hostName = getHostNameFromAction(actionsPkt, actionDef); + var hostName = getHostNameFromAction(actionsPkt, actionDef); s += "<td>" + escapeHTML(hostName) + "</td>"; - const hostgroupName = getHostgroupNameFromAction(actionsPkt, actionDef); + var hostgroupName = getHostgroupNameFromAction(actionsPkt, actionDef); s += "<td>" + escapeHTML(hostgroupName) + "</td>"; - const triggerBrief = getTriggerBriefFromAction(actionsPkt, actionDef); + var triggerBrief = getTriggerBriefFromAction(actionsPkt, actionDef); s += "<td>" + escapeHTML(triggerBrief) + "</td>"; - const triggerStatus = actionDef.triggerStatus; - let triggerStatusLabel = "ANY"; + var triggerStatus = actionDef.triggerStatus; + var triggerStatusLabel = "ANY"; if (triggerStatus !== null) triggerStatusLabel = makeTriggerStatusLabel(triggerStatus); s += "<td>" + triggerStatusLabel + "</td>"; - const triggerSeverity = actionDef.triggerSeverity; - let severityLabel = "ANY"; + var triggerSeverity = actionDef.triggerSeverity; + var severityLabel = "ANY"; if (triggerSeverity !== null) severityLabel = makeSeverityLabel(triggerSeverity); - const severityCompType = actionDef.triggerSeverityComparatorType; - let severityCompLabel = ""; + var severityCompType = actionDef.triggerSeverityComparatorType; + var severityCompLabel = ""; if (triggerSeverity !== null) severityCompLabel = makeSeverityCompTypeLabel(severityCompType); s += "<td>" + severityCompLabel + " " + severityLabel + "</td>"; - const type = actionDef.type; - const typeLabel = makeTypeLabel(type); + var type = actionDef.type; + var typeLabel = makeTypeLabel(type); s += "<td>" + typeLabel + "</td>"; - let workingDir = actionDef.workingDirectory; + var workingDir = actionDef.workingDirectory; if (!workingDir) workingDir = "N/A"; s += "<td>" + escapeHTML(workingDir) + "</td>"; - const command = actionDef.command; + var command = actionDef.command; s += "<td>" + escapeHTML(command) + "</td>"; - const timeout = actionDef.timeout; - let timeoutLabel; + var timeout = actionDef.timeout; + var timeoutLabel; if (timeout === 0) timeoutLabel = gettext("No limit"); else Modified: client/static/js/graphs_view.js (+2 -1) =================================================================== --- client/static/js/graphs_view.js 2017-06-23 17:08:51 +0900 (ff4b08b) +++ client/static/js/graphs_view.js 2017-06-30 14:32:05 +0900 (e467477) @@ -78,7 +78,8 @@ var GraphsView = function(userProfile) { // function drawTableBody(graphs) { var table = ""; - for (let graph of graphs) { + for (var i = 0; i < graphs.length; ++i) { + var graph = graphs[i]; var title = graph.title ? escapeHTML(graph.title) : gettext("No title"); var graphID = escapeHTML(graph.id); var graphURL = "ajax_history?id=" + graphID; Modified: client/static/js/hatohol_hostgroup_privilege_edit_dialog.js (+16 -15) =================================================================== --- client/static/js/hatohol_hostgroup_privilege_edit_dialog.js 2017-06-23 17:08:51 +0900 (2ecf2f1) +++ client/static/js/hatohol_hostgroup_privilege_edit_dialog.js 2017-06-30 14:32:05 +0900 (6e13d1e) @@ -185,10 +185,11 @@ HatoholHostgroupPrivilegeEditDialog.prototype.generateMainTable = function() { }; HatoholHostgroupPrivilegeEditDialog.prototype.generateTableRows = function() { - let s = ''; - const hostgroups = this.hostgroupData.hostgroups; - for (let hostgroup of hostgroups) + var s = ''; + var hostgroups = this.hostgroupData.hostgroups; + for (var i = 0; i < hostgroups.length; ++i) { + var hostgroup = hostgroups[i]; s += '<tr>'; s += '<td class="hostgroupSelectCheckboxes">' + '<input type="checkbox" class="hostgroupSelectCheckbox" ' + @@ -205,14 +206,14 @@ HatoholHostgroupPrivilegeEditDialog.prototype.updateAllowCheckboxes = function() if (!this.hostgroupData || !this.allowedServers) return; - const checkboxes = $(".hostgroupSelectCheckbox"); - let allowedHostgroup = {}; + var checkboxes = $(".hostgroupSelectCheckbox"); + var allowedHostgroup = {}; if (this.serverId in this.allowedServers) { allowedHostgroup = this.allowedServers[this.serverId].allowedHostgroups; } - for (let i = 0; i < checkboxes.length; i++) + for (var i = 0; i < checkboxes.length; i++) { hostgroupId = checkboxes[i].getAttribute("hostgroupId"); if (hostgroupId in allowedHostgroup) @@ -222,7 +223,7 @@ HatoholHostgroupPrivilegeEditDialog.prototype.updateAllowCheckboxes = function() HatoholHostgroupPrivilegeEditDialog.prototype.addAccessInfo = function(accessInfo) { var self = this; - const userId = this.userId; + var userId = this.userId; new HatoholConnector({ url: "/user/" + userId + "/access-info", request: "POST", @@ -244,7 +245,7 @@ HatoholHostgroupPrivilegeEditDialog.prototype.addAccessInfo = function(accessInf HatoholHostgroupPrivilegeEditDialog.prototype.deleteAccessInfo = function(accessInfoId) { var self = this; - const userId = this.userId; + var userId = this.userId; new HatoholConnector({ url: "/user/" + userId + "/access-info/" + accessInfoId, request: "DELETE", @@ -284,19 +285,19 @@ HatoholHostgroupPrivilegeEditDialog.prototype.checkApplyResult = function(access HatoholHostgroupPrivilegeEditDialog.prototype.applyPrivileges = function() { var self = this; - const checkboxes = $(".hostgroupSelectCheckbox"); + var checkboxes = $(".hostgroupSelectCheckbox"); var getAccessInfoId = function(hostgroupId) { - let allowedHostgroups; + var allowedHostgroups; if (self.serverId in self.allowedServers) allowedHostgroups = self.allowedServers[self.serverId].allowedHostgroups; else return 0; - let id; + var id; if (hostgroupId in allowedHostgroups) { - const allowedHostgroup = allowedHostgroups[hostgroupId]; + var allowedHostgroup = allowedHostgroups[hostgroupId]; id = allowedHostgroup.accessInfoId; } else @@ -311,10 +312,10 @@ HatoholHostgroupPrivilegeEditDialog.prototype.applyPrivileges = function() { numSucceeded: 0, numFailed: 0 }; - for (let i = 0; i < checkboxes.length; i++) + for (var i = 0; i < checkboxes.length; i++) { - const hostgroupId = checkboxes[i].getAttribute("hostgroupId"); - const accessInfoId = getAccessInfoId(hostgroupId); + var hostgroupId = checkboxes[i].getAttribute("hostgroupId"); + var accessInfoId = getAccessInfoId(hostgroupId); if (checkboxes[i].checked) { if (!accessInfoId) Modified: client/static/js/hatohol_incident_trackers_editor.js (+15 -12) =================================================================== --- client/static/js/hatohol_incident_trackers_editor.js 2017-06-23 17:08:51 +0900 (b215050) +++ client/static/js/hatohol_incident_trackers_editor.js 2017-06-30 14:32:05 +0900 (e23706b) @@ -108,32 +108,34 @@ HatoholIncidentTrackersEditor.prototype.load = function() { HatoholIncidentTrackersEditor.prototype.updateMainTable = function() { var self = this; - const setupCheckboxes = function() + var setupCheckboxes = function() { $(".deleteIncidentTracker").shiftcheckbox(); $(".deleteIncidentTracker").show(); $(".incidentTrackerSelectCheckbox").change(function() { - const selected = $(".incidentTrackerSelectCheckbox:checked"); + var selected = $(".incidentTrackerSelectCheckbox:checked"); $("#deleteIncidentTrackersButton").attr("disabled", !selected.length); }); }; - const setupEditButtons = function() + var setupEditButtons = function() { - const incidentTrackers = self.incidentTrackersData.incidentTrackers; - let incidentTrackersMap = {}; + var incidentTrackers = self.incidentTrackersData.incidentTrackers; + var incidentTrackersMap = {}; - for (let incidentTracker of incidentTrackers) + for (var i = 0; i < incidentTrackers.length; ++i) { + var incidentTracker = incidentTrackers[i]; incidentTrackersMap[incidentTracker.id] = incidentTracker; } - for (let incidentTracker of incidentTrackers) + for (var i = 0; i < incidentTrackers.length; ++i) { - const id = "#editIncidentTracker" + incidentTracker.id; + var incidentTracker = incidentTrackers[i]; + var id = "#editIncidentTracker" + incidentTracker.id; $(id).click(function() { - const incidentTrackerId = this.getAttribute("incidentTrackerId"); + var incidentTrackerId = this.getAttribute("incidentTrackerId"); new HatoholIncidentTrackerEditor( { succeededCallback: function() @@ -189,11 +191,12 @@ HatoholIncidentTrackersEditor.prototype.generateMainTable = function() { }; HatoholIncidentTrackersEditor.prototype.generateTableRows = function(data) { - let html = ''; + var html = ''; - for (let tracker of data.incidentTrackers) + for (var i = 0; i < data.incidentTrackers.length; ++i) { - let type = gettext("Unknown"); + var tracker = data.incidentTrackers[i]; + var type = gettext("Unknown"); if (tracker.type == hatohol.INCIDENT_TRACKER_REDMINE) { type = gettext("Redmine"); Modified: client/static/js/hatohol_monitoring_view.js (+1 -1) =================================================================== --- client/static/js/hatohol_monitoring_view.js 2017-06-23 17:08:51 +0900 (314ee3d) +++ client/static/js/hatohol_monitoring_view.js 2017-06-30 14:32:05 +0900 (3bd6b9b) @@ -457,7 +457,7 @@ HatoholMonitoringView.prototype.setupCheckboxForDelete = $(".selectcheckbox").attr("checked", false); jQObjDeleteButton.attr("disabled", true); $(".selectcheckbox").change(function() { - const selected = $(".selectcheckbox:checked"); + var selected = $(".selectcheckbox:checked"); jQObjDeleteButton.attr("disabled", !selected.length); }); }; Modified: client/static/js/hatohol_privilege_edit_dialog.js (+20 -18) =================================================================== --- client/static/js/hatohol_privilege_edit_dialog.js 2017-06-23 17:08:51 +0900 (8e5ce40) +++ client/static/js/hatohol_privilege_edit_dialog.js 2017-06-30 14:32:05 +0900 (23778d0) @@ -69,13 +69,14 @@ HatoholPrivilegeEditDialog.prototype.setMessage = function(msg) { HatoholPrivilegeEditDialog.prototype.setupSelectHostgroupDialog = function() { var self = this; - const servers = self.serversData.servers; - const userId = self.userId; - for (const server of servers) + var servers = self.serversData.servers; + var userId = self.userId; + for (var i = 0; i < servers.length; ++i) { - const id = "#edit-server" + server.id; + var server = servers[i]; + var id = "#edit-server" + server.id; $(id).click(function() { - const serverId = this.getAttribute("serverId"); + var serverId = this.getAttribute("serverId"); new HatoholHostgroupPrivilegeEditDialog( userId, serverId, applyPrivilegesCb); }); @@ -172,7 +173,7 @@ HatoholPrivilegeEditDialog.prototype.updateServersTable = function() { HatoholPrivilegeEditDialog.prototype.setupAllCheckButton = function() { $(".serverSelectCheckboxes").shiftcheckbox(); - const checkboxes = $(".serverSelectCheckbox"); + var checkboxes = $(".serverSelectCheckbox"); $("#all-check").click(function() { for (var i = 0; i < checkboxes.length; i++) checkboxes[i].checked = true; @@ -209,10 +210,11 @@ HatoholPrivilegeEditDialog.prototype.generateMainTable = function() { }; HatoholPrivilegeEditDialog.prototype.generateTableRows = function() { - let s = ''; - const servers = this.serversData.servers; - for (let server of servers) + var s = ''; + var servers = this.serversData.servers; + for (var i = 0; i < servers.length; ++i) { + var server = servers[i]; s += '<tr>'; s += '<td class="serverSelectCheckboxes">' + '<input type="checkbox" class="serverSelectCheckbox" ' + @@ -238,7 +240,7 @@ HatoholPrivilegeEditDialog.prototype.updateAllowCheckboxes = function() { if (!this.serversData || !this.allowedServers) return; - const checkboxes = $(".serverSelectCheckbox"); + var checkboxes = $(".serverSelectCheckbox"); var allHostgroupIsEnabled = function(server) { var ALL_HOST_GROUPS = "*", hostgroup; if (!server || !server.allowedHostgroups) @@ -247,10 +249,10 @@ HatoholPrivilegeEditDialog.prototype.updateAllowCheckboxes = function() { return hostgroup && hostgroup.accessInfoId; }; - for (let i = 0; i < checkboxes.length; i++) + for (var i = 0; i < checkboxes.length; i++) { - const checkbox = checkboxes[i]; - const serverId = checkbox.getAttribute("serverId"); + var checkbox = checkboxes[i]; + var serverId = checkbox.getAttribute("serverId"); if (allHostgroupIsEnabled(this.allowedServers[serverId])) { checkbox.checked = true; @@ -322,7 +324,7 @@ HatoholPrivilegeEditDialog.prototype.checkApplyResult = function(accessInfo) { HatoholPrivilegeEditDialog.prototype.applyPrivileges = function() { var self = this; - const checkboxes = $(".serverSelectCheckbox"); + var checkboxes = $(".serverSelectCheckbox"); var getAccessInfoId = function(serverId) { var id, allowedHostgroups, allowedHostgroup; var ALL_HOST_GROUPS = "*"; @@ -340,11 +342,11 @@ HatoholPrivilegeEditDialog.prototype.applyPrivileges = function() { numSucceeded: 0, numFailed: 0 }; - for (let i = 0; i < checkboxes.length; i++) + for (var i = 0; i < checkboxes.length; i++) { - const checkbox = checkboxes[i]; - const serverId = checkbox.getAttribute("serverId"); - const accessInfoId = getAccessInfoId(serverId); + var checkbox = checkboxes[i]; + var serverId = checkbox.getAttribute("serverId"); + var accessInfoId = getAccessInfoId(serverId); if (checkbox.checked) { if (!accessInfoId) Modified: client/static/js/hatohol_user_roles_editor.js (+23 -18) =================================================================== --- client/static/js/hatohol_user_roles_editor.js 2017-06-23 17:08:51 +0900 (e47a39d) +++ client/static/js/hatohol_user_roles_editor.js 2017-06-30 14:32:05 +0900 (168b00a) @@ -112,23 +112,25 @@ HatoholUserRolesEditor.prototype.updateMainTable = function() { var numSelected = 0; var setupCheckboxes = function() { $(".userRoleSelectCheckbox").change(function() { - const selected = $(".userRoleSelectCheckbox:checked"); + var selected = $(".userRoleSelectCheckbox:checked"); $("#deleteUserRolesButton").attr("disabled", !selected.length); }); }; var setupEditButtons = function() { - let userRoles = self.userRolesData.userRoles; - let userRolesMap = {}; + var userRoles = self.userRolesData.userRoles; + var userRolesMap = {}; - for (let userRole of userRoles) + for (var i = 0; i < userRoles.length; ++i) { + var userRole = userRoles[i]; userRolesMap[userRole.userRoleId] = userRole; } - for (let userRole of userRoles) + for (var i = 0; i < userRoles.length; ++i) { - const id = "#editUserRole" + userRole.userRoleId; + var userRole = userRoles[i]; + var id = "#editUserRole" + userRole.userRoleId; $(id).click(function() { var userRoleId = this.getAttribute("userRoleId"); @@ -184,14 +186,15 @@ HatoholUserRolesEditor.prototype.generateMainTable = function() { }; HatoholUserRolesEditor.prototype.generateTableRows = function(data) { - let html = ''; + var html = ''; html += '<tr><td class="deleteUserRole"></td><td>-</td><td>' + gettext('Guest') + '</td><td>' + gettext("None") +'</td></tr>'; html += '<tr><td class="deleteUserRole"></td><td>-</td><td>' + gettext('Admin') + '</td><td>' + gettext("All") +'</td></tr>'; - for (let role of data.userRoles) { + for (var i = 0; i < data.userRoles.length; ++i) { + var role = data.userRoles[i]; html += '<tr>' + '<td class="deleteUserRole">' + @@ -294,11 +297,12 @@ var HatoholUserRoleEditor = function(params) { } function getPrivilegeFlags() { - let flags = 0; - const privileges = self.hatoholPrivileges; - for (let privilege of privileges) + var flags = 0; + var privileges = self.hatoholPrivileges; + for (var i = 0; i < privileges.length; ++i) { - const checked = + var privilege = privileges[i]; + var checked = $(".privilegeCheckbox[value='" + privileges.indexOf(privilege) + "']").is(":checked"); if (checked) { @@ -517,10 +521,10 @@ HatoholUserRoleEditor.prototype.hatoholPrivileges = [ ]; HatoholUserRoleEditor.prototype.createMainElement = function() { - const name = this.userRole ? this.userRole.name : ""; - const flags = this.userRole ? this.userRole.flags : 0; - const privileges = this.hatoholPrivileges; - let html = '<div>'; + var name = this.userRole ? this.userRole.name : ""; + var flags = this.userRole ? this.userRole.flags : 0; + var privileges = this.hatoholPrivileges; + var html = '<div>'; // User role name html += @@ -536,9 +540,10 @@ HatoholUserRoleEditor.prototype.createMainElement = function() { '<div class="ui-widget-content" style="overflow-y: scroll; height: 200px">' + '<table class="table table-condensed table-striped table-hover">' + '<tbody>'; - for (let privilege of privileges) + for (var i = 0; i < privileges.length; ++i) { - const checked = hasFlag(flags, privilege.flag) ? "checked" : ""; + var privilege = privileges[i]; + var checked = hasFlag(flags, privilege.flag) ? "checked" : ""; html += '<tr>' + '<td class="privilegeSelector">' + Modified: client/static/js/incident_settings_view.js (+3 -2) =================================================================== --- client/static/js/incident_settings_view.js 2017-06-23 17:08:51 +0900 (2347f14) +++ client/static/js/incident_settings_view.js 2017-06-30 14:32:05 +0900 (ce819e7) @@ -144,9 +144,10 @@ var IncidentSettingsView = function(userProfile) { // function drawTableBody(actionsPkt) { - let s = ""; - for (let actionDef of actionsPkt["actions"]) + var s = ""; + for (var i = 0; i < actionsPkt["actions"].length; ++i) { + var actionDef = actionsPkt["actions"][i]; s += "<tr>"; s += "<td class='delete-selector' style='display:none'>"; s += "<input type='checkbox' class='selectcheckbox' "; Modified: client/static/js/servers_view.js (+6 -5) =================================================================== --- client/static/js/servers_view.js 2017-06-23 17:08:51 +0900 (8d7816a) +++ client/static/js/servers_view.js 2017-06-30 14:32:05 +0900 (4a5d227) @@ -167,14 +167,15 @@ var ServersView = function(userProfile) { function drawTableBody(rd) { - let s = ""; + var s = ""; - for (let server of rd["servers"]) + for (var i = 0; i < rd["servers"].length; ++i) { - const serverId = server["id"]; + var server = rd["servers"][i]; + var serverId = server["id"]; serverIds.push(serverId); - const idConnStat = getIdConnStat(serverId); - const serverURL = getServerLocation(server); + var idConnStat = getIdConnStat(serverId); + var serverURL = getServerLocation(server); s += "<tr>"; s += "<td class='delete-selector' style='display:none;'>"; s += "<input type='checkbox' class='selectcheckbox'" + Modified: client/static/js/severity_ranks_view.js (+8 -7) =================================================================== --- client/static/js/severity_ranks_view.js 2017-06-23 17:08:51 +0900 (afae6fe) +++ client/static/js/severity_ranks_view.js 2017-06-30 14:32:05 +0900 (5586f21) @@ -46,15 +46,16 @@ var SeverityRanksView = function(userProfile) { function drawTableBody(replyData) { - let html = ""; + var html = ""; - for (let severityRank of replyData.SeverityRanks) + for (var i = 0; i < replyData.SeverityRanks.length; ++i) { - const status = severityRank.status; - const color = severityRank.color; - const label = severityRank.label; - const asImportant = severityRank.asImportant; - const defaultLabel = severityChoices[status]; + var severityRank = replyData.SeverityRanks[i]; + var status = severityRank.status; + var color = severityRank.color; + var label = severityRank.label; + var asImportant = severityRank.asImportant; + var defaultLabel = severityChoices[status]; html += "<tr>"; html += "<td id='severity-rank-status" + escapeHTML(status) +"'>" + Modified: client/static/js/users_view.js (+3 -2) =================================================================== --- client/static/js/users_view.js 2017-06-23 17:08:51 +0900 (f70f5a3) +++ client/static/js/users_view.js 2017-06-30 14:32:05 +0900 (70bc2b0) @@ -147,10 +147,11 @@ var UsersView = function(userProfile) { // function drawTableBody(reply) { - let html = ""; + var html = ""; - for (let user of reply["users"]) + for (var i = 0; i < reply["users"].length; ++i) { + var user = reply["users"][i]; html += "<tr>"; html += "<td class='delete-selector' style='display:none;'>"; html += "<input type='checkbox' class='selectcheckbox'"; |
|
From: Travis CI <bu...@tr...> - 2017-06-29 01:37:55
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17574 Status: Failed Duration: 10 minutes and 7 seconds Commit: 371f063 (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/1bf3d4ae909c...371f0632255c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246071596?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-28 07:16:01
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17583 Status: Still Failing Duration: 40 minutes and 52 seconds Commit: 07f60f2 (master) Author: Masayuki Nakagawa Message: Merge pull request #2560 from project-hatohol/fix-to-reassign-to-variable-of-let Fix to reassign to variable of let View the changeset: https://github.com/project-hatohol/hatohol/compare/a3b633eb3c8d...07f60f2cd3d6 View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/247815756?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-28 06:55:05
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17574 Status: Failed Duration: 12 minutes and 44 seconds Commit: 371f063 (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/1bf3d4ae909c...371f0632255c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246071596?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Masayuki N. <nul...@cl...> - 2017-06-28 06:34:38
|
Masayuki Nakagawa 2017-06-28 15:34:19 +0900 (Wed, 28 Jun 2017) New Revision: 07f60f2cd3d6d430f9551c270fc02fbaa35800b0 https://github.com/project-hatohol/hatohol/commit/07f60f2cd3d6d430f9551c270fc02fbaa35800b0 Message: Merge pull request #2560 from project-hatohol/fix-to-reassign-to-variable-of-let Fix to reassign to variable of let |
|
From: Travis CI <bu...@tr...> - 2017-06-28 05:23:07
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17574 Status: Failed Duration: 16 minutes and 58 seconds Commit: 371f063 (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/1bf3d4ae909c...371f0632255c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246071596?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Masayuki N. <nul...@cl...> - 2017-06-23 10:27:18
|
Masayuki Nakagawa 2017-06-23 16:07:50 +0900 (Fri, 23 Jun 2017) New Revision: 06b4ed56c4d3200b12563e242db5d7c00dde0984 https://github.com/project-hatohol/hatohol-packages/commit/06b4ed56c4d3200b12563e242db5d7c00dde0984 Message: [RPMS][SRPMS] Add 17.06 packages Added files: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-ceilometer-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-common-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-fluentd-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-nagios-livestatus-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-nagios-ndoutils-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-rabbitmq-connector-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-zabbix-17.06-1.el6.x86_64.rpm RPMS/17.06/17.06-1/hatohol-debuginfo-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-devel-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-ceilometer-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-common-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-fluentd-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-nagios-livestatus-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-nagios-ndoutils-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-rabbitmq-connector-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-hap2-zabbix-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-lib-common-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-server-17.06-1.el7.x86_64.rpm RPMS/17.06/17.06-1/hatohol-web-17.06-1.el7.x86_64.rpm SRPMS/hatohol-17.06-1.el6.src.rpm SRPMS/hatohol-17.06-1.el7.src.rpm Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-ceilometer-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-common-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-fluentd-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-nagios-livestatus-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-nagios-ndoutils-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-rabbitmq-connector-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/el6-plugins/hatohol-hap2-zabbix-17.06-1.el6.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-debuginfo-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-devel-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-ceilometer-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-common-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-fluentd-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-nagios-livestatus-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-nagios-ndoutils-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-rabbitmq-connector-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-hap2-zabbix-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-lib-common-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-server-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: RPMS/17.06/17.06-1/hatohol-web-17.06-1.el7.x86_64.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: SRPMS/hatohol-17.06-1.el6.src.rpm (+0 -0) 100644 =================================================================== (Binary files differ) Added: SRPMS/hatohol-17.06-1.el7.src.rpm (+0 -0) 100644 =================================================================== (Binary files differ) |
|
From: Travis CI <bu...@tr...> - 2017-06-23 09:57:27
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17582 Status: Still Failing Duration: 45 minutes and 6 seconds Commit: a3b633e (master) Author: Masayuki Nakagawa Message: Merge pull request #2561 from project-hatohol/update-readme [Doc] Bump up Hatohol version in README View the changeset: https://github.com/project-hatohol/hatohol/compare/4cdb7173ed97...a3b633eb3c8d View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246104122?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-23 09:27:14
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17580 Status: Failed Duration: 48 minutes and 29 seconds Commit: 6d2fa6e (17.06) Author: Masayuki Nakagawa Message: [po] Update po View the changeset: https://github.com/project-hatohol/hatohol/compare/17.06 View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246076940?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-23 08:57:46
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17579 Status: Errored Duration: 48 minutes and 34 seconds Commit: 6d2fa6e (17.06_releng/master) Author: Masayuki Nakagawa Message: [po] Update po View the changeset: https://github.com/project-hatohol/hatohol/compare/c737587b644e^...6d2fa6e0208b View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246076311?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-23 08:28:50
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17578 Status: Failed Duration: 49 minutes and 15 seconds Commit: 6905a53 (update-readme) Author: Masayuki Nakagawa Message: [Doc] Bump up Hatohol version in README View the changeset: https://github.com/project-hatohol/hatohol/commit/6905a535d50d View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246076211?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Masayuki N. <nul...@cl...> - 2017-06-23 08:09:10
|
Masayuki Nakagawa 2017-06-23 17:08:51 +0900 (Fri, 23 Jun 2017) New Revision: a3b633eb3c8d9a7b2a1d2f83e1b4422d6f4617bb https://github.com/project-hatohol/hatohol/commit/a3b633eb3c8d9a7b2a1d2f83e1b4422d6f4617bb Message: Merge pull request #2561 from project-hatohol/update-readme [Doc] Bump up Hatohol version in README |
|
From: Travis CI <bu...@tr...> - 2017-06-23 07:00:20
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17575 Status: Failed Duration: 48 minutes and 44 seconds Commit: 7567892 (fix-to-reassign-to-variable-of-let) Author: otakuto Message: Fix to reassign to variable of let View the changeset: https://github.com/project-hatohol/hatohol/commit/7567892758cc View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246072068?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-23 06:30:12
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17574 Status: Errored Duration: 49 minutes and 54 seconds Commit: 371f063 (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/1bf3d4ae909c...371f0632255c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246071596?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Travis CI <bu...@tr...> - 2017-06-23 06:10:53
|
Build Update for project-hatohol/hatohol ------------------------------------- Build: #17573 Status: Errored Duration: 40 minutes and 44 seconds Commit: 1bf3d4a (change-jshint-to-eslint) Author: otakuto Message: change jshint to eslint View the changeset: https://github.com/project-hatohol/hatohol/compare/9d77704ea328...1bf3d4ae909c View the full build log and details: https://travis-ci.org/project-hatohol/hatohol/builds/246070748?utm_source=email&utm_medium=notification -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications |
|
From: Masayuki N. <nul...@cl...> - 2017-06-23 06:03:00
|
Masayuki Nakagawa 2017-06-21 13:19:44 +0900 (Wed, 21 Jun 2017) New Revision: 6905a535d50dd353a97150eb2b63c6be754d00ff https://github.com/project-hatohol/hatohol/commit/6905a535d50dd353a97150eb2b63c6be754d00ff Message: [Doc] Bump up Hatohol version in README Modified files: README.md client/README.md server/README.md Modified: README.md (+3 -3) =================================================================== --- README.md 2017-06-09 18:11:02 +0900 (5286540) +++ README.md 2017-06-21 13:19:44 +0900 (a187f23) @@ -14,7 +14,7 @@ http://www.hatohol.org/ - [Installation](#user-content-installation) - [Installation by RPM files (only for CentOS 7)](#user-content-installation-by-rpm-files-only-for-centos-7) - [Installation by building needed applications](#user-content-installation-by-building-needed-applications) - - [About Upgrade on CentOS 7 (x86_64) from version 16.01 to version 16.04](#user-content-about-upgrade-on-centos-7-x86_64-from-version-1601-to-version-1604) + - [About Upgrade on CentOS 7 (x86_64) from version 16.12_to version 17.06](#user-content-about-upgrade-on-centos-7-x86_64-from-version-1612-to-version-1706) - [Plans](#user-content-plans) - [Mailing Lists](#user-content-mailing-lists) @@ -89,13 +89,13 @@ Other pages are being constructed. ## Installation ### Installation by RPM files (only for CentOS 7) -The detailed document is [here](https://github.com/project-hatohol/website/blob/master/contents/docs/install/16.04/en/index.md) +The detailed document is [here](https://github.com/project-hatohol/website/blob/master/contents/docs/install/17.06/en/index.md) ### Installation by building needed applications - [Server installation](server/README.md) - [Client (Web UI server) installation](client/README.md) -### About Upgrade on CentOS 7 (x86_64) from version 16.01 to version 16.04 +### About Upgrade on CentOS 7 (x86_64) from version 16.12 to version 17.06 We are currently under investigation. ## Plans Modified: client/README.md (+1 -1) =================================================================== --- client/README.md 2017-06-09 18:11:02 +0900 (41898d0) +++ client/README.md 2017-06-21 13:19:44 +0900 (60e7f46) @@ -33,7 +33,7 @@ maintained by [joequery] (http://joequery.github.io/Stupid-Table-Plugin/) ## How to setup -> See also [this page](https://github.com/project-hatohol/website/blob/master/contents/docs/install/16.04/en/index.md) +> See also [this page](https://github.com/project-hatohol/website/blob/master/contents/docs/install/17.06/en/index.md) > to setup Hatohol for CentOS with the binary packages. ### Install Hatohol Client Modified: server/README.md (+1 -1) =================================================================== --- server/README.md 2017-06-09 18:11:02 +0900 (7084b9a) +++ server/README.md 2017-06-21 13:19:44 +0900 (2c99c50) @@ -59,7 +59,7 @@ the specific monitoring software in various way. - uuid-dev ### Example to install required libraries on CentOS 7 -> See also [this page](https://github.com/project-hatohol/website/blob/master/contents/docs/install/16.01/ja/index.md) +> See also [this page](https://github.com/project-hatohol/website/blob/master/contents/docs/install/17.06/ja/index.md) > to setup Hatohol for CentOS with the binary packages. First, you need to install development tools to build Hatohol and some required |
|
From: otakuto <nul...@cl...> - 2017-06-23 05:36:43
|
otakuto 2017-06-23 14:36:12 +0900 (Fri, 23 Jun 2017) New Revision: 7567892758cc4af3e0da48cc4962b367d3188da7 https://github.com/project-hatohol/hatohol/commit/7567892758cc4af3e0da48cc4962b367d3188da7 Message: Fix to reassign to variable of let Modified files: client/static/js/incident_settings_view.js Modified: client/static/js/incident_settings_view.js (+2 -2) =================================================================== --- client/static/js/incident_settings_view.js 2017-06-09 18:11:02 +0900 (2347f14) +++ client/static/js/incident_settings_view.js 2017-06-23 14:36:12 +0900 (a321bb3) @@ -161,13 +161,13 @@ var IncidentSettingsView = function(userProfile) { s += "<td>" + escapeHTML(hostgroupName) + "</td>"; const triggerStatus = actionDef.triggerStatus; - const triggerStatusLabel = "ANY"; + let triggerStatusLabel = "ANY"; if (triggerStatus !== null) triggerStatusLabel = makeTriggerStatusLabel(triggerStatus); s += "<td>" + triggerStatusLabel + "</td>"; const triggerSeverity = actionDef.triggerSeverity; - const severityLabel = "ANY"; + let severityLabel = "ANY"; if (triggerSeverity !== null) severityLabel = makeSeverityLabel(triggerSeverity); |
|
From: otakuto <nul...@cl...> - 2017-06-23 05:33:36
|
otakuto 2017-06-14 15:51:47 +0900 (Wed, 14 Jun 2017) New Revision: 371f0632255ce952e4a25fb97ee0f2312a1ae0cd https://github.com/project-hatohol/hatohol/commit/371f0632255ce952e4a25fb97ee0f2312a1ae0cd Message: change jshint to eslint Added files: .eslintrc.yml Removed files: .jshintrc Modified files: Gulpfile.js package.json test/run-client-test.sh Added: .eslintrc.yml (+31 -0) 100644 =================================================================== --- /dev/null +++ .eslintrc.yml 2017-06-14 15:51:47 +0900 (7501ba6) @@ -0,0 +1,31 @@ +env: + es6: true + jquery: true + browser: true +globals: + gettext: true + escapeHTML: true +rules: + indent: + - warn + - 2 + max-len: + - warn + - code: 100 + dot-notation: + - warn + eqeqeq: + - warn + quotes: + - warn + - double + semi: + - warn + - always + space-before-function-paren: + - warn + - never + no-unused-vars: + - warn + - args: none + vars: local Deleted: .jshintrc (+0 -12) 100644 =================================================================== --- .jshintrc 2017-06-14 16:21:56 +0900 (0e846b4) +++ /dev/null @@ -1,12 +0,0 @@ -{ - "indent" : 2, // indent depth - "maxlen" : 100, // max length of line - "sub": true, - "eqeqeq": false, - "lastsemic": true, - - // Relaxing Options - "eqnull" : true, // permit "== null" comparison - "expr" : true, // permit x || (x = 1); expression - "loopfunc": true -} \ No newline at end of file Modified: Gulpfile.js (+0 -11) =================================================================== --- Gulpfile.js 2017-06-14 16:21:56 +0900 (ac218df) +++ Gulpfile.js 2017-06-14 15:51:47 +0900 (62e4d6c) @@ -1,5 +1,4 @@ var gulp = require("gulp"); -var jshint = require("gulp-jshint"); var mochaPhantomJS = require('gulp-mocha-phantomjs'); gulp.task('browsertest', function () { @@ -21,13 +20,3 @@ gulp.task('browsertest', function () { stream.end(); return stream; }); - -gulp.task("lint", function() { - gulp.src(["./client/static/js/*.js", "./client/static/js.plugins/*.js", - "!./client/static/js/hatohol_def.js"]) - .pipe(jshint()) - .pipe(jshint.reporter("default")) - .pipe(jshint.reporter("fail")); -}); - -gulp.task('default', ['lint']); Modified: package.json (+5 -2) =================================================================== --- package.json 2017-06-14 16:21:56 +0900 (a618b91) +++ package.json 2017-06-14 15:51:47 +0900 (d7e41b3) @@ -10,10 +10,13 @@ "mocha-phantomjs": "~3.6.0", "casperjs": "~1.1.0-beta4", "gulp": "~3.9.1", - "gulp-jshint": "~2.0.0", - "gulp-mocha-phantomjs": "~0.11.0" + "gulp-mocha-phantomjs": "~0.11.0", + "eslint": "~3.19.0" }, "dependencies": { "npm-check-updates": "~1.5.1" + }, + "scripts": { + "lint": "eslint client/static/js/*.js client/static/js.plugins/*.js --ignore-pattern client/static/js/hatohol_def.js" } } Modified: test/run-client-test.sh (+1 -1) =================================================================== --- test/run-client-test.sh 2017-06-14 16:21:56 +0900 (10611c2) +++ test/run-client-test.sh 2017-06-14 15:51:47 +0900 (f9d936a) @@ -12,6 +12,6 @@ ${TOP_DIR}/test/launch-hatohol-for-test.sh || exit 1 $(npm bin)/mocha-phantomjs http://localhost:8000/test/index.html || FAILED=1 # manage.py has a child process. We have to kill it too. cat $PIDS_FILE | awk '{ print "ps h -p " $1 " --ppid " $1 " -o pid" }' | sh | awk '{ print "kill " $1 }' | sh -$(npm bin)/gulp lint || FAILED=1 +npm run lint || FAILED=1 exit $FAILED |
|
From: otakuto <nul...@cl...> - 2017-06-23 05:33:34
|
otakuto 2017-06-14 16:21:56 +0900 (Wed, 14 Jun 2017) New Revision: 39c5a094d3b4e5f12822785acc8727005f8b3e2e https://github.com/project-hatohol/hatohol/commit/39c5a094d3b4e5f12822785acc8727005f8b3e2e Message: bump node 7 Modified files: .travis.yml Modified: .travis.yml (+1 -0) =================================================================== --- .travis.yml 2017-06-09 18:11:02 +0900 (7cbbb3c) +++ .travis.yml 2017-06-14 16:21:56 +0900 (2bc36c1) @@ -57,6 +57,7 @@ before_install: - if [ "$CXX" = "clang++" ]; then sudo apt-get install -qq libstdc++-4.8-dev; fi - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + - nvm install 7 install: - server/misc/setup-cutter.sh |
9 messages has been excluded from this view by a project administrator.
