Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"Manage goals" page in the reporting menu #7704

Merged
merged 3 commits into from Apr 21, 2015
Merged

"Manage goals" page in the reporting menu #7704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
819fa39
#7345 New way to manage goals
mnapoli Apr 19, 2015
3f455d1
#7704 Link to "add a new goal" when there is no existing goal
mnapoli Apr 21, 2015
7257a15
#7704 Fix link
mnapoli Apr 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 34 additions & 21 deletions plugins/Goals/Controller.php
View file
Open in desktop
Expand Up @@ -168,27 +168,7 @@ public function manage()

$view = new View('@Goals/manageGoals');
$this->setGeneralVariablesView($view);

$goals = $this->goals;
$view->goals = $goals;

$idGoal = Common::getRequestVar('idGoal', 0, 'int');
$view->idGoal = 0;
if ($idGoal && array_key_exists($idGoal, $goals)) {
$view->idGoal = $idGoal;
}

// unsanitize goal names and other text data (not done in API so as not to break
// any other code/cause security issues)

foreach ($goals as &$goal) {
$goal['name'] = Common::unsanitizeInputValue($goal['name']);
if (isset($goal['pattern'])) {
$goal['pattern'] = Common::unsanitizeInputValue($goal['pattern']);
}
}
$view->goalsJSON = json_encode($goals);
$view->ecommerceEnabled = $this->site->isEcommerceEnabled();
$this->setEditGoalsViewVariables($view);
return $view->render();
}

Expand Down Expand Up @@ -263,6 +243,15 @@ public function addNewGoal()
return $view->render();
}

public function editGoals()
{
$view = new View('@Goals/editGoals');
$this->setGeneralVariablesView($view);
$this->setEditGoalsViewVariables($view);
$view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite);
return $view->render();
}

public function getEvolutionGraph(array $columns = array(), $idGoal = false, array $defaultColumns = array())
{
if (empty($columns)) {
Expand Down Expand Up @@ -486,4 +475,28 @@ private function getGoalReportsByDimensionTable($conversions, $ecommerce = false

return $goalReportsByDimension->render();
}

private function setEditGoalsViewVariables($view)
{
$goals = $this->goals;
$view->goals = $goals;

$idGoal = Common::getRequestVar('idGoal', 0, 'int');
$view->idGoal = 0;
if ($idGoal && array_key_exists($idGoal, $goals)) {
$view->idGoal = $idGoal;
}

// unsanitize goal names and other text data (not done in API so as not to break
// any other code/cause security issues)

foreach ($goals as &$goal) {
$goal['name'] = Common::unsanitizeInputValue($goal['name']);
if (isset($goal['pattern'])) {
$goal['pattern'] = Common::unsanitizeInputValue($goal['pattern']);
}
}
$view->goalsJSON = json_encode($goals);
$view->ecommerceEnabled = $this->site->isEcommerceEnabled();
}
}
47 changes: 22 additions & 25 deletions plugins/Goals/Menu.php
View file
Open in desktop
Expand Up @@ -24,43 +24,40 @@ public function configureReportingMenu(MenuReporting $menu)
$goals = API::getInstance()->getGoals($idSite);
$mainGoalMenu = 'Goals_Goals';

$linkToAddNewGoal = $this->urlForAction('addNewGoal', array(
'idGoal' => null
));

$order = 1;

if (count($goals) == 0) {

$linkToAddNewGoal = $this->urlForAction('addNewGoal', array(
'idGoal' => null,
));
$menu->addItem($mainGoalMenu, '', $linkToAddNewGoal, 25);
$menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $linkToAddNewGoal, 1);
return;
}

} else {

$url = $this->urlForAction('index', array('idGoal' => null));
$order = 1;

$menu->addItem($mainGoalMenu, '', $url, 25);
$menu->addItem($mainGoalMenu, 'General_Overview', $url, ++$order);
$url = $this->urlForAction('index', array('idGoal' => null));

$group = new Group();
foreach ($goals as $goal) {
$subMenuName = str_replace('%', '%%', Translate::clean($goal['name']));
$params = $this->urlForAction('goalReport', array('idGoal' => $goal['idgoal']));
$tooltip = sprintf('%s (id = %d)', $subMenuName, $goal['idgoal']);
$menu->addItem($mainGoalMenu, '', $url, 25);
$menu->addItem($mainGoalMenu, 'General_Overview', $url, ++$order);

if (count($goals) > 3) {
$group->add($subMenuName, $params, $tooltip);
} else {
$menu->addItem($mainGoalMenu, $subMenuName, $params, ++$order, $tooltip);
}
}
$group = new Group();
foreach ($goals as $goal) {
$subMenuName = str_replace('%', '%%', Translate::clean($goal['name']));
$params = $this->urlForAction('goalReport', array('idGoal' => $goal['idgoal']));
$tooltip = sprintf('%s (id = %d)', $subMenuName, $goal['idgoal']);

if (count($goals) > 3) {
$menu->addGroup($mainGoalMenu, 'Goals_ChooseGoal', $group, ++$order, $tooltip = false);
$group->add($subMenuName, $params, $tooltip);
} else {
$menu->addItem($mainGoalMenu, $subMenuName, $params, ++$order, $tooltip);
}
}

if (count($goals) > 3) {
$menu->addGroup($mainGoalMenu, 'Goals_ChooseGoal', $group, ++$order, $tooltip = false);
}

$menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $linkToAddNewGoal, ++$order);
$menu->addItem($mainGoalMenu, 'Goals_ManageGoals', $this->urlForAction('editGoals'), ++$order);
}

public function configureUserMenu(MenuUser $menu)
Expand Down
2 changes: 1 addition & 1 deletion plugins/Goals/templates/addNewGoal.twig
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<h2 piwik-enriched-headline>{{ 'Goals_AddNewGoal'|translate }}</h2>
<p>{{ 'Goals_NewGoalIntro'|translate }}</p>
<p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
{{ 'Goals_ManageGoalsOrCreateANewGoal'|translate("<a href='" ~ linkTo({'module':'Goals','action':'manage'}) ~ "'>","</a>")|raw }}
{{ 'Goals_ManageGoalsOrCreateANewGoal'|translate("<a href='#module=Goals&action=editGoals'>","</a>")|raw }}
</p>

{% include "@Goals/_addEditGoal.twig" %}
Expand Down
17 changes: 17 additions & 0 deletions plugins/Goals/templates/editGoals.twig
View file
Open in desktop
@@ -0,0 +1,17 @@
{% if userCanEditGoals %}

<h2 piwik-enriched-headline>{{ 'Goals_ManageGoals'|translate }}</h2>

{% include "@Goals/_addEditGoal.twig" %}

{% else %}

<h2>{{ 'Goals_CreateNewGOal'|translate }}</h2>
<p>
{{ 'Goals_NoGoalsNeedAccess'|translate|raw }}
</p>
<p>
{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}
</p>

{% endif %}