diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-08-11 03:56:34 +0400 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-08-11 03:56:34 +0400 |
| commit | 3fba824ef472a21aaa5a6091437a25a380d9fafb (patch) | |
| tree | f54d62a0355ae8e3e44c58a056f4a87211cb4ad9 | |
| parent | 9f1426d6ca98df0362caec577c9a40c5c0c62157 (diff) | |
Only returning pattern and pattern type when the goal is not manually triggered - only displaying in the UI when not manually.
| -rw-r--r-- | plugins/Goals/API.php | 5 | ||||
| -rw-r--r-- | plugins/Goals/templates/form_add_goal.tpl | 5 | ||||
| -rw-r--r-- | plugins/Goals/templates/list_goal_edit.tpl | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 22d69e3026..687b1c7ef3 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -35,6 +35,11 @@ class Piwik_Goals_API foreach($goals as &$goal) { unset($goal['idsite']); + if($goal['match_attribute'] == 'manually') { + unset($goal['pattern']); + unset($goal['pattern_type']); + unset($goal['case_sensitive']); + } $cleanedGoals[$goal['idgoal']] = $goal; } return $cleanedGoals; diff --git a/plugins/Goals/templates/form_add_goal.tpl b/plugins/Goals/templates/form_add_goal.tpl index 406b030b3f..b60dbe7ad4 100644 --- a/plugins/Goals/templates/form_add_goal.tpl +++ b/plugins/Goals/templates/form_add_goal.tpl @@ -55,9 +55,8 @@ color:#9B9B9B; </tbody> <tbody id="manual_trigger_section" style="display:none"> <tr> - <td>where the visited page</td> - <td> - manually calls the JavaScript piwikTracker.trackGoal() method (<a href='misc/redirectToUrl.php?url=http://piwik.org/docs/javascript-tracking/'>learn more</a>) + <td colspan="2"> + where the visited page manually calls the JavaScript piwikTracker.trackGoal() method (<a target='_blank' href='misc/redirectToUrl.php?url=http://piwik.org/docs/javascript-tracking/'>learn more</a>) </td> </tr> </tbody> diff --git a/plugins/Goals/templates/list_goal_edit.tpl b/plugins/Goals/templates/list_goal_edit.tpl index 615c9f9174..92cab34b25 100644 --- a/plugins/Goals/templates/list_goal_edit.tpl +++ b/plugins/Goals/templates/list_goal_edit.tpl @@ -12,7 +12,7 @@ <tr> <td>{$goal.idgoal}</td> <td>{$goal.name}</td> - <td>{$goal.match_attribute} <br>Pattern {$goal.pattern_type}: {$goal.pattern}</b></td> + <td>{$goal.match_attribute} {if isset($goal.pattern_type)}<br>Pattern {$goal.pattern_type}: {$goal.pattern}</b>{/if}</td> <td>{if $goal.revenue==0}-{else}{$currency}{$goal.revenue}{/if}</td> <td><a href='#' name="linkEditGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/edit.png' border=0> Edit</a></td> <td><a href='#' name="linkDeleteGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/remove.png' border=0> Delete</a></td> |