Merge pull request #7817 from piwik/7806

Fixes #7806, fix All websites dashboard lists website names double encoded error.

plugins/MultiSites/angularjs/site/site.controller.js

@@ -14,6 +14,7 @@
         $scope.period = piwik.period;
         $scope.date   = piwik.broadcast.getValueFromUrl('date');
         $scope.sparklineImage = sparklineImage;
+        $scope.website.label  = piwik.helper.htmlDecode($scope.website.label);
 
         this.getWebsite = function () {
             return $scope.website;

expected-ui-screenshots @ 79a26456

-Subproject commit 524fbd5ba2484020b69626e657239f2d4f9fa844
+Subproject commit 79a26456d70e31c661be76ad4f94ac28eb105cb5

tests/UI/specs/MultiSites_spec.js

@@ -13,12 +13,43 @@ describe("MultiSitesTest", function () {
     var generalParams = 'idSite=1&period=year&date=2012-08-09';
     var selector = '.pageWrap,.expandDataTableFooterDrawer';
 
+    var createdSiteId = null;
+
+    before(function (done) {
+        var callback = function (error, response) {
+            if (error) {
+                done(error, response);
+                return;
+            }
+            
+            createdSiteId = response.value;
+            done();
+        };
+
+        testEnvironment.callApi("SitesManager.addSite", {
+            siteName: '%3CMy%20website%22%27%3E%3B%2C%3F',
+            urls: 'http%3A%2F%2Fpiwik.org'},
+        callback);
+    });
+
+    after(function (done) {
+        if (createdSiteId) {
+            testEnvironment.callApi("SitesManager.deleteSite", {idSite: createdSiteId}, done);
+        }
+    });
+
     it('should load the all websites dashboard correctly', function (done) {
         expect.screenshot('all_websites').to.be.captureSelector(selector, function (page) {
             page.load("?" + generalParams + "&module=MultiSites&action=index");
         }, done);
     });
 
+    it('should load next page correctly', function (done) {
+        expect.screenshot('all_websites_page_1').to.be.captureSelector(selector, function (page) {
+            page.click('.paging .next');
+        }, done);
+    });
+
     it('should search correctly', function (done) {
         expect.screenshot('all_websites_search').to.be.captureSelector(selector, function (page) {
             page.sendKeys('.site_search input', 'Site');
@@ -32,4 +63,4 @@ describe("MultiSitesTest", function () {
         }, done);
     });
 
-});
+});
\ No newline at end of file