Merge branch 'dev-angular' of github.com:opf/openproject into dev-angular

app/assets/javascripts/angular/controllers/work-packages-controller.js

@@ -33,12 +33,6 @@ angular.module('openproject.workPackages.controllers')
     '$q',
     '$window',
     '$location',
-    'columnsModal',
-    'exportModal',
-    'saveModal',
-    'settingsModal',
-    'shareModal',
-    'sortingModal',
     'WorkPackagesTableHelper',
     'WorkPackagesTableService',
     'WorkPackageService',
@@ -47,8 +41,7 @@ angular.module('openproject.workPackages.controllers')
     'WorkPackageLoadingHelper',
     'INITIALLY_SELECTED_COLUMNS',
     'OPERATORS_AND_LABELS_BY_FILTER_TYPE',
-    function($scope, $q, $window, $location, columnsModal, exportModal, saveModal,
-      settingsModal, shareModal, sortingModal,
+    function($scope, $q, $window, $location,
       WorkPackagesTableHelper, WorkPackagesTableService,
       WorkPackageService, QueryService, PaginationService,
       WorkPackageLoadingHelper, INITIALLY_SELECTED_COLUMNS,
@@ -209,26 +202,6 @@ angular.module('openproject.workPackages.controllers')
     return false;
   };
 
-  // Modals
-
-  $scope.showColumnsModal  = columnsModal.activate;
-  $scope.showExportModal   = exportModal.activate;
-  $scope.showSettingsModal = settingsModal.activate;
-  $scope.showShareModal    = shareModal.activate;
-  $scope.showSortingModal  = sortingModal.activate;
-
-  $scope.showSaveModal     = function(saveAs){
-    $scope.$emit('hideAllDropdowns');
-    if( saveAs || $scope.query.isNew() ){
-      saveModal.activate();
-    } else {
-      QueryService.saveQuery()
-        .then(function(data){
-          $scope.$emit('flashMessage', data.status);
-        });
-    }
-  };
-
   // Go
 
   initialSetup();

app/assets/javascripts/angular/directives/work_packages/options-dropdown-directive.js

@@ -0,0 +1,69 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+angular.module('openproject.workPackages.directives')
+
+.directive('optionsDropdown', ['I18n',
+  'columnsModal',
+  'exportModal',
+  'saveModal',
+  'settingsModal',
+  'shareModal',
+  'sortingModal',
+  function(I18n, columnsModal, exportModal, saveModal, settingsModal, shareModal, sortingModal){
+
+  return {
+    restrict: 'AE',
+    scope: true,
+    link: function(scope, element, attributes) {
+
+      // Modals
+      scope.showColumnsModal  = columnsModal.activate;
+      scope.showExportModal   = exportModal.activate;
+      scope.showSettingsModal = settingsModal.activate;
+      scope.showShareModal    = shareModal.activate;
+      scope.showSortingModal  = sortingModal.activate;
+
+      scope.showSaveModal     = function(saveAs){
+        scope.$emit('hideAllDropdowns');
+        if( saveAs || scope.query.isNew() ){
+          saveModal.activate();
+        } else {
+          QueryService.saveQuery()
+            .then(function(data){
+              scope.$emit('flashMessage', data.status);
+            });
+        }
+      };
+
+      scope.toggleDisplaySums = function(){
+        scope.query.displaySums = !scope.query.displaySums;
+      }
+    }
+  };
+}]);

app/views/work_packages/index.html.erb

@@ -77,11 +77,11 @@ end
     </ul>
   </div>
 
-  <div class="dropdown dropdown-relative dropdown-anchor-right" id="settingsDropdown">
+  <div options-dropdown class="dropdown dropdown-relative dropdown-anchor-right" id="settingsDropdown">
     <ul class="dropdown-menu">
       <li><a href ng-click="showColumnsModal()">Columns…</a></li>
       <li><a href ng-click="showSortingModal()">Sorting…</a></li>
-      <li><a href>Display sums</a></li>
+      <li><a href ng-click="toggleDisplaySums()">Display sums</a></li>
       <li class="dropdown-divider"></li>
       <li><a href ng-click="showSaveModal()">Save</a></li>
       <li><a href ng-click="showSaveModal(true)">Save as</a></li>