diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-05-17 06:59:58 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-05-17 06:59:58 +0400 |
commit | 52625d05767349610256d503ac3e33878cf1e2bb (patch) | |
tree | 56b02fcd123ce5d98d3bff25e47af06136a65277 | |
parent | 047412dee8725f6f69b2c8f6bfe04d905f180673 (diff) | |
parent | 84d8be30edecc13def35589aafceb41fbaac5aa2 (diff) |
Merge remote-tracking branch 'origin/master'1.12-b15
-rw-r--r-- | plugins/SitesManager/templates/SitesManager.js | 11 | ||||
-rw-r--r-- | tests/PHPUnit/bootstrap.php | 26 |
2 files changed, 34 insertions, 3 deletions
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js index 2f3c777927..4ff38d2159 100644 --- a/plugins/SitesManager/templates/SitesManager.js +++ b/plugins/SitesManager/templates/SitesManager.js @@ -157,6 +157,11 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc $('.addRowSite').click(function () { piwikHelper.hideAjaxError(); $('.addRowSite').toggle(); + + var excludedUserAgentCell = ''; + if ($('#exclude-user-agent-header').is(':visible')) { + excludedUserAgentCell = '<td><textarea cols="20" rows="4" id="excludedUserAgents"></textarea><br />' + excludedUserAgentsHelp + '</td>'; + } var numberOfRows = $('table#editSites')[0].rows.length; var newRowId = 'rowNew' + numberOfRows; @@ -166,9 +171,9 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc <td><input id="name" value="Name" size="15" /><br/><br/><br/>' + submitButtonHtml + '</td>\ <td><textarea cols="25" rows="3" id="urls">http://siteUrl.com/\nhttp://siteUrl2.com/</textarea><br />' + aliasUrlsHelp + keepURLFragmentSelectHTML + '</td>\ <td><textarea cols="20" rows="4" id="excludedIps"></textarea><br />' + excludedIpHelp + '</td>\ - <td><textarea cols="20" rows="4" id="excludedQueryParameters"></textarea><br />' + excludedQueryParametersHelp + '</td>\ - <td><textarea cols="20" rows="4" id="excludedUserAgents"></textarea><br />' + excludedUserAgentsHelp + '</td>\ - <td>' + getSitesearchSelector(false) + '</td>\ + <td><textarea cols="20" rows="4" id="excludedQueryParameters"></textarea><br />' + excludedQueryParametersHelp + '</td>' + + excludedUserAgentCell + + '<td>' + getSitesearchSelector(false) + '</td>\ <td>' + getTimezoneSelector(defaultTimezone) + '<br />' + timezoneHelp + '</td>\ <td>' + getCurrencySelector(defaultCurrency) + '<br />' + currencyHelp + '</td>\ <td>' + getEcommerceSelector(0) + '<br />' + ecommerceHelp + '</td>\ diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index fe0d757b4d..8e72bcd125 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -25,6 +25,32 @@ if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) { error_reporting(E_ALL | E_NOTICE); @date_default_timezone_set('UTC'); +$useXhprof = false; +if ($useXhprof) { + require_once PIWIK_INCLUDE_PATH . '/tests/lib/xhprof-0.9.2/xhprof_lib/utils/xhprof_runs.php'; + + if (!isset($profilerNamespace)) { + $firstLineOfGitHead = file(PIWIK_INCLUDE_PATH . '/.git/HEAD'); + $firstLineOfGitHead = $firstLineOfGitHead[0]; + + $parts = explode("/", $firstLineOfGitHead); + $currentGitBranch = trim($parts[2]); + + $profilerNamespace = "piwik.$currentGitBranch"; + } + + xhprof_enable(XHPROF_FLAGS_CPU + XHPROF_FLAGS_MEMORY); + + register_shutdown_function(function () use($profilerNamespace) { + $xhprofData = xhprof_disable(); + + $xhprofRuns = new \XHProfRuns_Default(); + $runId = $xhprofRuns->save_run($xhprofData, $profilerNamespace); + + echo "\n\nPROFILER RUN URL: /tests/lib/xhprof-0.9.2/xhprof_html/?source=$profilerNamespace&run=$runId\n\n"; + }); +} + require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php'; require_once PIWIK_INCLUDE_PATH . '/core/Loader.php'; |