Merge branch 'release/5.0' into dev

app/models/project/storage.rb

@@ -89,9 +89,9 @@ module Project::Storage
       <<-SQL
       SELECT wiki.project_id, SUM(wiki_attached.filesize) AS filesize
       FROM #{Wiki.table_name} wiki
-      LEFT JOIN #{WikiPage.table_name} pages
+      JOIN #{WikiPage.table_name} pages
         ON pages.wiki_id = wiki.id
-      LEFT JOIN #{Attachment.table_name} wiki_attached
+      JOIN #{Attachment.table_name} wiki_attached
         ON (wiki_attached.container_id = pages.id AND wiki_attached.container_type = 'WikiPage')
       GROUP BY wiki.project_id
       SQL
@@ -101,7 +101,7 @@ module Project::Storage
       <<-SQL
       SELECT wp.project_id, SUM(wp_attached.filesize) AS filesize
       FROM #{WorkPackage.table_name} wp
-      LEFT JOIN #{Attachment.table_name} wp_attached
+      JOIN #{Attachment.table_name} wp_attached
         ON (wp_attached.container_id = wp.id AND wp_attached.container_type = 'WorkPackage')
       GROUP BY wp.project_id
       SQL

config/locales/js-en.yml

@@ -190,7 +190,6 @@ en:
     label_rejected_files_reason: "These files cannot be uploaded as their size is greater than %{maximumFilesize}"
     label_wait: "Please wait for configuration..."
     label_upload_counter: "%{done} of %{count} files finished"
-    label_successful_update: 'Successful update'
     label_validation_error: "The work package could not be saved due to the following errors:"
 
     placeholders:

frontend/app/components/routing/controllers/work-package-details.controller.js

@@ -39,9 +39,10 @@ function WorkPackageDetailsController($scope, $state, latestTab, workPackage, I1
     latestTab.registerState(toState.name);
   });
 
-  $rootScope.$on('workPackageRefreshRequired', function(e) {
+  var refreshRequiredFunction = $rootScope.$on('workPackageRefreshRequired', function() {
     refreshWorkPackage();
   });
+  $scope.$on('$destroy', refreshRequiredFunction);
 
   // initialization
   setWorkPackageScopeProperties(workPackage);

frontend/app/components/routing/controllers/work-package-show.controller.js

@@ -47,9 +47,10 @@ function WorkPackageShowController($scope, $rootScope, $state, latestTab, workPa
 
   // Listen to the event globally, as listeners are not necessarily
   // in the child scope
-  $rootScope.$on('workPackageRefreshRequired', function() {
+  var refreshRequiredFunction = $rootScope.$on('workPackageRefreshRequired', function() {
     refreshWorkPackage();
   });
+  $scope.$on('$destroy', refreshRequiredFunction);
 
   AuthorisationService.initModelAuth('work_package', workPackage.links);
 
@@ -299,7 +300,7 @@ function WorkPackageShowController($scope, $rootScope, $state, latestTab, workPa
       });
     });
     $scope.$on('workPackageUpdatedInEditor', function() {
-      NotificationsService.addSuccess(I18n.t('js.label_successful_update'));
+      NotificationsService.addSuccess(I18n.t('js.notice_successful_update'));
     });
   }
 }

frontend/app/work_packages/controllers/details-tab-overview-controller.js

@@ -87,7 +87,7 @@ module.exports = function(
       });
     });
     $scope.$on('workPackageUpdatedInEditor', function() {
-      NotificationsService.addSuccess(I18n.t('js.label_successful_update'));
+      NotificationsService.addSuccess(I18n.t('js.notice_successful_update'));
     });
   }
 };

frontend/tsd.json

@@ -28,6 +28,9 @@
     },
     "angularjs/angular-mocks.d.ts": {
       "commit": "40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"
+    },
+    "lodash/lodash.d.ts": {
+      "commit": "627b6c158b73494c803f36fc2fe00ad75faa8fde"
     }
   }
 }

frontend/typings/tsd.d.ts

@@ -6,3 +6,4 @@
 /// <reference path="assertion-error/assertion-error.d.ts" />
 /// <reference path="chai/chai.d.ts" />
 /// <reference path="angularjs/angular-mocks.d.ts" />
+/// <reference path="lodash/lodash.d.ts" />