From 057bebcd99bb43faa7c210692e64aac7eae854c2 Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Thu, 3 Mar 2016 16:29:46 +0100 Subject: [PATCH] remove no longer necessary mapping service --- .../api-param-mapping.service.ts | 49 ------------------- .../components/query/query-service.service.ts | 6 +-- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 frontend/app/components/api/api-experimental/api-param-mapping.service.ts diff --git a/frontend/app/components/api/api-experimental/api-param-mapping.service.ts b/frontend/app/components/api/api-experimental/api-param-mapping.service.ts deleted file mode 100644 index a5cd6f5d4d..0000000000 --- a/frontend/app/components/api/api-experimental/api-param-mapping.service.ts +++ /dev/null @@ -1,49 +0,0 @@ -// -- copyright -// OpenProject is a project management system. -// Copyright (C) 2012-2015 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. -// ++ - -export class ApiParamMappingService { - - //TODO: Add missing properties. - protected static propertyMap = { - assigned_to: 'assignee', - updated_at: 'updatedAt' - }; - - public static columnListToV3(columns: any[]) { - columns.forEach(column => column.name = ApiParamMappingService.columnToV3(column)); - return columns; - } - - public static columnToV3(column: any) { - return ApiParamMappingService.propertyMap[column.name] || column.name; - } -} - -angular - .module('openproject.api') - .service('ApiParamMappingService', ApiParamMappingService); diff --git a/frontend/app/components/query/query-service.service.ts b/frontend/app/components/query/query-service.service.ts index c3382a1676..79fd969a2d 100644 --- a/frontend/app/components/query/query-service.service.ts +++ b/frontend/app/components/query/query-service.service.ts @@ -27,7 +27,6 @@ // ++ function QueryService(Query, - ApiParamMappingService, $http, PathHelper, $q, @@ -198,10 +197,7 @@ function QueryService(Query, var url = projectIdentifier ? PathHelper.apiProjectAvailableColumnsPath(projectIdentifier) : PathHelper.apiAvailableColumnsPath(); - return QueryService.doGet(url, function(response){ - availableColumns = ApiParamMappingService.constructor.columnListToV3(response.data.available_columns); - return availableColumns; - }); + return QueryService.doGet(url, (response) => response.data.available_columns); }, getGroupBy: function() {