Skip to content

Commit

Permalink
Refs matomo-org#472 Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattab
mattab committed Apr 10, 2014
1 parent e5b28b3 commit a8bb960
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 14 deletions.
6 changes: 5 additions & 1 deletion core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ protected function retrieveFileLocations()

protected function addThemeFiles()
{
if(in_array($this->getTheme()->getThemeName(), $this->plugins)) {
$theme = $this->getTheme();
if(!$theme) {
return;
}
if(in_array($theme->getThemeName(), $this->plugins)) {

$jsInThemes = $this->getTheme()->getJavaScriptFiles();

Expand Down
1 change: 1 addition & 0 deletions core/Plugin/Manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Piwik\Filesystem;
use Piwik\Option;
use Piwik\Plugin;
use Piwik\SettingsServer;
use Piwik\Singleton;
use Piwik\Theme;
use Piwik\Tracker;
Expand Down
1 change: 1 addition & 0 deletions piwik.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
} else {
$vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
}
require_once $vendorDirectory . '/autoload.php';
require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php';
require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php';

Expand Down
10 changes: 6 additions & 4 deletions plugins/Events/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
"TotalValue": "Total value",
"MinValue": "Minimum value",
"MaxValue": "Maximum value",
"AvgValue": "Average value",
"EventsWithValue": "Events with a value",
"TotalEventsDocumentation": "Total number of events",
"TotalValueDocumentation": "Total value of events (this is the sum of event values)",
"MinValueDocumentation": "Minimum value for this event",
"MaxValueDocumentation": "Maximum value for this event",
"TotalValueDocumentation": "The sum of event values",
"MinValueDocumentation": "The minimum value for this event",
"MaxValueDocumentation": "The maximum value for this event",
"AvgValueDocumentation": "The average of all values for this event",
"EventsWithValueDocumentation": "Number of events where an Event value was set",
"NameNotSet": "(Event Name not set)",
"EventValueTooltip": "Total Event value based on %s events %s between %s and %s.",
"EventValueTooltip": "Total Event value is the sum of %s events values %s between minimum of %s and maximum of %s.",
"AvgEventValue": "Average Event value is: %s",
"TopEvents": "Top Events",
"ViewEvents": "View Events"
Expand Down
21 changes: 18 additions & 3 deletions ...gration/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</metrics>
<metricsDocumentation>
<nb_events>Total number of events</nb_events>
<sum_event_value>Total value of events (sum of event values)</sum_event_value>
<min_event_value>Minimum value for this event</min_event_value>
<max_event_value>Maximum value for this event</max_event_value>
<sum_event_value>The sum of event values</sum_event_value>
<min_event_value>The minimum value for this event</min_event_value>
<max_event_value>The maximum value for this event</max_event_value>
<avg_event_value>The average of all values for this event</avg_event_value>
<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
</metricsDocumentation>
<actionToLoadSubTables>getNameFromActionId</actionToLoadSubTables>
Expand All @@ -33,6 +35,7 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</columns>
<reportData>
Expand All @@ -44,6 +47,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Search</label>
Expand All @@ -52,6 +56,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play25%</label>
Expand All @@ -60,6 +65,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play50%</label>
Expand All @@ -68,6 +74,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>play75%</label>
Expand All @@ -76,6 +83,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playEnd</label>
Expand All @@ -84,6 +92,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>rating</label>
Expand All @@ -92,6 +101,7 @@
<sum_event_value>57.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
<avg_event_value>9.55</avg_event_value>
</row>
<row>
<label>clickBuyNow</label>
Expand All @@ -100,6 +110,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
Expand All @@ -108,6 +119,7 @@
<sum_event_value>19.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>play</label>
Expand All @@ -116,6 +128,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>playStart</label>
Expand All @@ -124,6 +137,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Purchase</label>
Expand All @@ -132,6 +146,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
</result>
<result prettyDate="Monday 4 January 2010" />
Expand Down
12 changes: 9 additions & 3 deletions ...ation/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</metrics>
<metricsDocumentation>
<nb_events>Total number of events</nb_events>
<sum_event_value>Total value of events (sum of event values)</sum_event_value>
<min_event_value>Minimum value for this event</min_event_value>
<max_event_value>Maximum value for this event</max_event_value>
<sum_event_value>The sum of event values</sum_event_value>
<min_event_value>The minimum value for this event</min_event_value>
<max_event_value>The maximum value for this event</max_event_value>
<avg_event_value>The average of all values for this event</avg_event_value>
<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
</metricsDocumentation>
<actionToLoadSubTables>getActionFromCategoryId</actionToLoadSubTables>
Expand All @@ -33,6 +35,7 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</columns>
<reportData>
Expand All @@ -44,6 +47,7 @@
<sum_event_value>19.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>Music</label>
Expand All @@ -52,6 +56,7 @@
<sum_event_value>38</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
<avg_event_value>9.5</avg_event_value>
</row>
<row>
<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
Expand All @@ -60,6 +65,7 @@
<sum_event_value>19.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
<avg_event_value>9.66</avg_event_value>
</row>
</result>
<result prettyDate="Monday 4 January 2010" />
Expand Down
16 changes: 13 additions & 3 deletions ...tegration/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</metrics>
<metricsDocumentation>
<nb_events>Total number of events</nb_events>
<sum_event_value>Total value of events (sum of event values)</sum_event_value>
<min_event_value>Minimum value for this event</min_event_value>
<max_event_value>Maximum value for this event</max_event_value>
<sum_event_value>The sum of event values</sum_event_value>
<min_event_value>The minimum value for this event</min_event_value>
<max_event_value>The maximum value for this event</max_event_value>
<avg_event_value>The average of all values for this event</avg_event_value>
<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
</metricsDocumentation>
<actionToLoadSubTables>getActionFromNameId</actionToLoadSubTables>
Expand All @@ -33,6 +35,7 @@
<sum_event_value>Total value</sum_event_value>
<min_event_value>Minimum value</min_event_value>
<max_event_value>Maximum value</max_event_value>
<avg_event_value>Average value</avg_event_value>
<nb_events_with_value>Events with a value</nb_events_with_value>
</columns>
<reportData>
Expand All @@ -44,6 +47,7 @@
<sum_event_value>19.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>La fiancée de l&amp;#039;eau</label>
Expand All @@ -52,6 +56,7 @@
<sum_event_value>38</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>10</max_event_value>
<avg_event_value>9.5</avg_event_value>
</row>
<row>
<label>(Event Name not set)</label>
Expand All @@ -60,6 +65,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
Expand All @@ -68,6 +74,7 @@
<sum_event_value>19.32</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>9.66</max_event_value>
<avg_event_value>9.66</avg_event_value>
</row>
<row>
<label>Ponyo (崖の上のポニョ)</label>
Expand All @@ -76,6 +83,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Princess Mononoke (もののけ姫)</label>
Expand All @@ -84,6 +92,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
<row>
<label>Search query here</label>
Expand All @@ -92,6 +101,7 @@
<sum_event_value>0</sum_event_value>
<min_event_value>0</min_event_value>
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
</result>
<result prettyDate="Monday 4 January 2010" />
Expand Down

0 comments on commit a8bb960

Please sign in to comment.