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:
authordizzy <diosmosis@users.noreply.github.com>2022-08-11 17:16:44 +0300
committerGitHub <noreply@github.com>2022-08-11 17:16:44 +0300
commita7b1f06156676c8d5a1b1a6e8eefdd027825e118 (patch)
tree8c7783c7b6a2f3e0ab200444cd50d7ac5b132e8b /plugins/CoreHome/templates
parentf61e05846627a63a473fcdd0aa8f2eb5ad322f4f (diff)
[Vue] remove angularjs from Dashboard plugin (#19442)
* remove use of angularjs from SegmentEditor plugin * remove import added by phpstorm * make sure to export comparison service instance not just class * built vue files * remove angularjs from Dashboard plugin * built vue files * fixing some issues * fix initial value for segment definition * treat null, undefined and empty string segment value the same * Update expected screenshots * try to fix timing error in test * Allow composer plugins for dev dependency codesniffer to fix travis builds. * get to load in UI * getting dashboard settings control to work * fixing UI test issues, reintroduce compileAngularComponents (will remove calls in CoreHome PR) * fixing some more issues * hide the dashboard manager on initial display as before * update expected screenshots * fixing DashboardManager UI test that previously used the uiControlObject property * fix race condition in dashboard ajax requests/aborts * remove duplicate translation * remove use of html_attr escape * remove unused use statements * fix shown entity id in reporting menu Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CoreHome/templates')
-rw-r--r--plugins/CoreHome/templates/_indexContent.twig2
-rw-r--r--plugins/CoreHome/templates/getDefaultIndexView.twig2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CoreHome/templates/_indexContent.twig b/plugins/CoreHome/templates/_indexContent.twig
index 27edc9b758..17a581a115 100644
--- a/plugins/CoreHome/templates/_indexContent.twig
+++ b/plugins/CoreHome/templates/_indexContent.twig
@@ -5,7 +5,7 @@
<div class="top_controls">
{% include "@CoreHome/_periodSelect.twig" %}
{{ postEvent("Template.nextToCalendar") }}
- {% render dashboardSettingsControl %}
+ <div vue-entry="Dashboard.DashboardSettings"></div>
{% include "@CoreHome/_headerMessage.twig" %}
{{ ajax.requestErrorDiv(contactEmail|default(''), false, '', showMoreFaqInfo) }}
</div>
diff --git a/plugins/CoreHome/templates/getDefaultIndexView.twig b/plugins/CoreHome/templates/getDefaultIndexView.twig
index db399dbaa9..84c20dd3e3 100644
--- a/plugins/CoreHome/templates/getDefaultIndexView.twig
+++ b/plugins/CoreHome/templates/getDefaultIndexView.twig
@@ -5,7 +5,7 @@
{% include "@CoreHome/_siteSelectHeader.twig" %}
{% include "@CoreHome/_periodSelect.twig" %}
{{ postEvent("Template.nextToCalendar") }}
- {% render dashboardSettingsControl %}
+ <div vue-entry="Dashboard.DashboardSettings"></div>
{% include "@CoreHome/_headerMessage.twig" %}
{% endblock %}