The project is not loaded in the resource from the table when compared to the single request. I believe we should remove the entire authorization class and replace it with something closely related to the way HalResources work.pull/4605/head
Oliver Günther
8 years ago
parent
7780126274
commit
f78d2041f8
@ -0,0 +1,103 @@ |
||||
//-- 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.
|
||||
//++
|
||||
|
||||
|
||||
import {opWorkPackagesModule} from '../../angular-modules'; |
||||
import {WorkPackageResourceInterface} from '../api/api-v3/hal-resources/work-package-resource.service'; |
||||
|
||||
var $state; |
||||
var PathHelper; |
||||
|
||||
export class WorkPackageAuthorization { |
||||
|
||||
public project:any; |
||||
|
||||
constructor(public workPackage:WorkPackageResourceInterface) { |
||||
this.project = workPackage.project; |
||||
} |
||||
|
||||
public get allActions() { |
||||
return { |
||||
workPackage: this.workPackage, |
||||
project: this.project |
||||
}; |
||||
} |
||||
|
||||
public copyLink() { |
||||
if ($state.current.name.indexOf('work-packages.show') === 0) { |
||||
return PathHelper.workPackageCopyPath(this.workPackage.id); |
||||
} |
||||
else if ($state.current.name.indexOf('work-packages.list.details') === 0) { |
||||
return PathHelper.workPackageDetailsCopyPath(this.project.identifier, this.workPackage.id); |
||||
} |
||||
} |
||||
|
||||
public linkForAction(action) { |
||||
if (action.key === 'copy') { |
||||
action.link = this.copyLink(); |
||||
} |
||||
else { |
||||
action.link = this.allActions[action.resource][action.link].href; |
||||
} |
||||
|
||||
return action; |
||||
} |
||||
|
||||
public isPermitted(action) { |
||||
return this.allActions[action.resource] !== undefined && |
||||
this.allActions[action.resource][action.link] !== undefined; |
||||
} |
||||
|
||||
public permittedActionKeys(allowedActions) { |
||||
var validActions = _.filter(allowedActions, this.isPermitted, this); |
||||
|
||||
return _.map(validActions, function (action) { |
||||
return action.key; |
||||
}); |
||||
} |
||||
|
||||
public permittedActionsWithLinks(allowedActions) { |
||||
var validActions = _.filter(_.cloneDeep(allowedActions), this.isPermitted, this); |
||||
|
||||
var allowed = _.map(validActions, this.linkForAction, this); |
||||
|
||||
return allowed; |
||||
} |
||||
} |
||||
|
||||
function wpAuthorizationService(...args) { |
||||
[$state, PathHelper] = args; |
||||
return WorkPackageAuthorization; |
||||
} |
||||
|
||||
wpAuthorizationService.$inject = [ |
||||
'$state', |
||||
'PathHelper' |
||||
]; |
||||
|
||||
opWorkPackagesModule.factory('WorkPackageAuthorization', wpAuthorizationService); |
||||
@ -1,90 +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.
|
||||
//++
|
||||
|
||||
module.exports = function(ProjectService, $state, PathHelper) { |
||||
|
||||
var WorkPackageAuthorization = function (workPackage) { |
||||
this.workPackage = workPackage; |
||||
|
||||
if (angular.isDefined(this.workPackage.project)) { |
||||
this.project = workPackage.project; |
||||
} |
||||
else { |
||||
this.project = ProjectService.getWorkPackageProject(this.workPackage).then(function(project) { |
||||
return project; |
||||
}); |
||||
} |
||||
|
||||
this.allActions = { |
||||
workPackage: this.workPackage, |
||||
project: this.project |
||||
}; |
||||
}; |
||||
|
||||
WorkPackageAuthorization.prototype = { |
||||
copyLink: function() { |
||||
if ($state.current.name.indexOf('work-packages.show') === 0){ |
||||
return PathHelper.workPackageCopyPath(this.workPackage.id); |
||||
} |
||||
else if ($state.current.name.indexOf('work-packages.list.details') === 0) { |
||||
return PathHelper.workPackageDetailsCopyPath(this.project.identifier, |
||||
this.workPackage.id); |
||||
} |
||||
}, |
||||
linkForAction: function(action) { |
||||
if (action.key === 'copy') { |
||||
action.link = this.copyLink(); |
||||
} |
||||
else { |
||||
action.link = this.allActions[action.resource][action.link].href; |
||||
} |
||||
|
||||
return action; |
||||
}, |
||||
isPermitted: function(action) { |
||||
return this.allActions[action.resource] !== undefined && |
||||
this.allActions[action.resource][action.link] !== undefined; |
||||
}, |
||||
permittedActionKeys: function(allowedActions) { |
||||
var validActions = _.filter(allowedActions, this.isPermitted, this); |
||||
|
||||
return _.map(validActions, function(action) { |
||||
return action.key; |
||||
}); |
||||
}, |
||||
permittedActionsWithLinks: function(allowedActions) { |
||||
var validActions = _.filter(_.cloneDeep(allowedActions), this.isPermitted, this); |
||||
|
||||
var allowed = _.map(validActions, this.linkForAction, this); |
||||
|
||||
return allowed; |
||||
} |
||||
}; |
||||
|
||||
return WorkPackageAuthorization; |
||||
}; |
||||
Loading…
Reference in new issue