Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-06-21 21:18:18 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-06-21 21:18:18 +0400
commit69baa276c51eb63d58b3c52b43914e55719fb5aa (patch)
treef2972a94500e4bf65093d287e70609c4db1c0b8e /plugins/Goals
parent01e42402ace2f29045ad3fcfce12f56f48c77295 (diff)
Fixes #774
* last known bug of the Goals plugin: show relevant columns when clicking the Goal icons. Show all columns when looking at the Goals report. Show only columns for the selected goal if looking at goal report.
Diffstat (limited to 'plugins/Goals')
-rw-r--r--plugins/Goals/templates/add_edit_goal.tpl2
-rw-r--r--plugins/Goals/templates/table_by_segment.tpl5
2 files changed, 2 insertions, 5 deletions
diff --git a/plugins/Goals/templates/add_edit_goal.tpl b/plugins/Goals/templates/add_edit_goal.tpl
index 7ca5bf6876..c153f67c88 100644
--- a/plugins/Goals/templates/add_edit_goal.tpl
+++ b/plugins/Goals/templates/add_edit_goal.tpl
@@ -1,5 +1,3 @@
-<br/><br/><br/>
-
{if isset($onlyShowAddNewGoal)}
<h2>{'Goals_AddNewGoal'|translate}</h2>
{else}
diff --git a/plugins/Goals/templates/table_by_segment.tpl b/plugins/Goals/templates/table_by_segment.tpl
index 1d5c82c628..3dfa45eaa5 100644
--- a/plugins/Goals/templates/table_by_segment.tpl
+++ b/plugins/Goals/templates/table_by_segment.tpl
@@ -12,7 +12,6 @@
</li>
{/foreach}
</ul>
- <br/>
{/foreach}
</div>
@@ -25,7 +24,6 @@
{literal}
<script type="text/javascript">
$(document).ready( function() {
-
var countLoaded = 0;
/*
* For each 'segment' in the list, a click will trigger an ajax request to load the datatable
@@ -40,11 +38,12 @@ $(document).ready( function() {
widgetUniqueId = module+action;
self.expectedWidgetUniqueId = widgetUniqueId;
+ var idGoal = broadcast.getValueFromHash('idGoal');
var widgetParameters = {
'module': module,
'action': action,
'viewDataTable': 'tableGoals',
- 'idGoal': broadcast.getValueFromHash('idGoal')
+ 'filter_only_display_idgoal': idGoal.length ? idGoal : 0 // 0 is Piwik_DataTable_Filter_UpdateColumnsWhenShowAllGoals::GOALS_FULL_TABLE
};
var onWidgetLoadedCallback = function (response) {
if(widgetUniqueId != self.expectedWidgetUniqueId) {