ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix codacy warnings and remove unused code

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2019-03-05 09:29:28 +01:00
parent 4481fc1ace
commit ee93d64fd0
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/controller/BoardController.js
View File

@@ -346,7 +346,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
BoardService.getCurrent().labels.push(data); BoardService.getCurrent().labels.push(data);
$scope.status.createLabel = false; $scope.status.createLabel = false;
$scope.newLabel = {}; $scope.newLabel = {};
}).catch(err => { }).catch((err) => {
OC.Notification.showTemporary(err); OC.Notification.showTemporary(err);
}); });
}; };
@@ -357,7 +357,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
$scope.labelUpdate = function (label) { $scope.labelUpdate = function (label) {
label.edit = false; label.edit = false;
LabelService.update(label).catch(err => { LabelService.update(label).catch((err) => {
label.title = label.renameTitle; label.title = label.renameTitle;
OC.Notification.showTemporary(err); OC.Notification.showTemporary(err);
}); });

17
lib/Service/LabelService.php
View File

@@ -92,7 +92,6 @@ class LabelService {
$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE); $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
//$this->checkDuplicateTitle($boardId, $title);
$boardLabels = $this->labelMapper->findAll($boardId); $boardLabels = $this->labelMapper->findAll($boardId);
if (\is_array($boardLabels)) { if (\is_array($boardLabels)) {
foreach($boardLabels as $boardLabel) { foreach($boardLabels as $boardLabel) {
@@ -166,7 +165,6 @@ class LabelService {
$this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE); $this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE);
$label = $this->find($id); $label = $this->find($id);
//$this->checkDuplicateTitle($label->getBoardId(), $title);
$boardLabels = $this->labelMapper->findAll($label->getBoardId()); $boardLabels = $this->labelMapper->findAll($label->getBoardId());
if (\is_array($boardLabels)) { if (\is_array($boardLabels)) {
@@ -191,19 +189,4 @@ class LabelService {
return $this->labelMapper->update($label); return $this->labelMapper->update($label);
} }
/**
* @param $boardId
* @param $title
* @throws BadRequestException
*/
private function checkDuplicateTitle($boardId, $title) {
$boardLabels = $this->labelMapper->findAll($boardId);
foreach($boardLabels as $boardLabel) {
if ($boardLabel->getTitle() === $title) {
throw new BadRequestException('title must be unique');
break;
}
}
}
} }