Skip to content
Extraits de code Groupes Projets
Valider 933932a5 rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Refs #584

 * Remove completely filter_only_display_idgoal from codebase, renamed to idGoal. Appears not to break anything

git-svn-id: http://dev.piwik.org/svn/trunk@5381 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 3af2a31d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -60,8 +60,7 @@ class Piwik_API_DataTableGenericFilter
),
'AddColumnsProcessedMetricsGoal' => array(
'filter_update_columns_when_show_all_goals' => array('integer'),
// third array element names the request variable to check
'filter_only_display_idgoal' => array('string', $goalsOverviewConst, 'idGoal'),
'idGoal' => array('string', $goalsOverviewConst),
),
'Sort' => array(
'filter_sort_column' => array('string'),
......@@ -125,7 +124,7 @@ class Piwik_API_DataTableGenericFilter
}
try {
$value = Piwik_Common::getRequestVar($varName, $defaultValue, $type, $this->request);
$value = Piwik_Common::getRequestVar($name, $defaultValue, $type, $this->request);
settype($value, $type);
$filterParameters[] = $value;
}
......
......@@ -60,14 +60,13 @@ $(document).ready( function() {
widgetUniqueId = module+action;
self.expectedWidgetUniqueId = widgetUniqueId;
var idGoal = broadcast.getValueFromHash('idGoal');
var widgetParameters = {
'module': module,
'action': action,
};
if (window.location.hash.indexOf('idGoal') !== -1) {
widgetParameters['idGoal'] = idGoal.length ? idGoal : 0;
}
var idGoal = broadcast.getValueFromHash('idGoal');
widgetParameters['idGoal'] = idGoal.length ? idGoal : 0; //Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE;
// Loading segment table means loading Goals view for Top Countries/etc.
if(module != 'Goals') {
widgetParameters['viewDataTable'] = 'tableGoals';
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter