diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-10-07 22:51:40 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-10-07 22:51:40 +0300 |
| commit | 89d8479ac242b2ffc98053fe504ce882086c6999 (patch) | |
| tree | 6e47c9898547520ab52bf842ca6be84f36c6e153 /plugins/SitesManager | |
| parent | 5470c4f46cbc00ee704ffee6bfae965412771ad3 (diff) | |
Add possibility to manage and view Intranet websites (#13473)3.6.1-b3
* Add possibility to manage and view Intranet websites #7724
* more tweaks
* ui tests
* fix some tests
* added missing name
* remove intranet setting, added test for tracking
* fix various tests
* remove test
* Update RequestProcessor.php
* Update en.json
* fix some tests
* do not throw exception if site does not exist
* seeing just now it is fine to trigger exception
* debug error
* log only certain requests
* Update piwik.php
* Update JsProxyTest.php
* trying to fix tests
* remove debug code
* trying to fix tests
Diffstat (limited to 'plugins/SitesManager')
8 files changed, 15 insertions, 14 deletions
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 8c77fe78e7..76576f84ed 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -162,6 +162,7 @@ class SitesManager extends \Piwik\Plugin $array['sitesearch_category_parameters'] = $this->getTrackerSearchCategoryParameters($website); $array['timezone'] = $this->getTimezoneFromWebsite($website); $array['ts_created'] = $website['ts_created']; + $array['type'] = $website['type']; } /** diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index daa9172431..0db92c30ef 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13bb0b46c784cc0351ef9ecd3b0df4a1d73e3ed723f6b09327a4ca48374b7794 -size 170243 +oid sha256:a9445d71546bb4e54fd3a555cbb0fa2048b72193dd2ff6addd46768c9fd99e26 +size 184243 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png index d6568fb2af..2fa307c54e 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e99ecde5ef09992789bf65fe4637b94b1ade0a15bdac019f8ee9c25891101b9 -size 175143 +oid sha256:ee5bc2bcf319ec6d3648fc0b81c8c132259c78839576698272d58c3fb4b94a7d +size 188593 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png index e7e3f52b9c..9324e70e6e 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a981370541c453b1f083b32e4ecfb1553d27f06627c9ab946d90e43564221dd -size 175165 +oid sha256:a1b449a3b400295e8be4ea971c18b397ba9fb6fa86159ccc045a90ca1131dffb +size 188746 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png index 4473de1f61..19bdd8ce5d 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c604a68139ece0e6a7b62bfb62adee646056d66a6f9d14834064d7feb26770b -size 176904 +oid sha256:3326127c0cd1eef67be6ce3ea824eeff79e3b96d91f37195715a7bd6ce211f7d +size 190483 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 2e12376d6b..7d8b4b1adc 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e17697a106bac0358fa6951fa77819cca47b91521b9c624c2c2ceb243505719d -size 168447 +oid sha256:1ae3dea0fbdc20b296fbc7186e8919259236ca4cbf1998936688029abeb011f5 +size 182456 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_no_result.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_no_result.png index 8570c22b95..0fc9c6798f 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_no_result.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_no_result.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:238224decfa68bfc3f6c1f2bc7d244b1aae18da067073960150ed87b978f8524 -size 44695 +oid sha256:dc478746d93c12cbed265b66536a5fa80ca0f34e79bb645f6f0af007d75eca12 +size 45092 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png index 8f2bfbca46..09c61f98ca 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2581dfa9c981be6b3cb25f2e218a21695286b1b83e16df11964aea29cb90388 -size 173221 +oid sha256:cc492dc9b8da8cc933eb1eabd02011c21865146642f1d38d8bba490a01a38113 +size 186784 |
