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

new try

Browse Source 
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
This commit is contained in:
Jakob Röhrl
2019-01-24 10:19:05 +01:00
committed by Julius Härtl
parent ab73f58fd8
commit f01cd506f7
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/controller/BoardController.js
View File

@@ -323,7 +323,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
// remove from board data // remove from board data
var i = BoardService.getCurrent().labels.indexOf(label); var i = BoardService.getCurrent().labels.indexOf(label);
BoardService.getCurrent().labels.splice(i, 1); BoardService.getCurrent().labels.splice(i, 1);
// remove from cards // remove from cards
var cards = CardService.data; var cards = CardService.data;
for (var card in cards) { for (var card in cards) {
@@ -346,11 +346,17 @@ 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 => {
OC.Notification.showTemporary('Duplicate label name is not allowed');
}); });
}; };
$scope.labelUpdate = function (label) { $scope.labelUpdate = function (label) {
label.edit = false; label.edit = false;
LabelService.update(label); LabelService.update(label).catch(err => {
label.title('XXX');
OC.Notification.showTemporary('Duplicate label name is not allowed');
});
// update labels in UI // update labels in UI
var cards = CardService.data; var cards = CardService.data;

22
lib/Service/LabelService.php
View File

@@ -92,7 +92,14 @@ class LabelService {
$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE); $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
$this->checkDuplicateTitle($boardId, $title); //$this->checkDuplicateTitle($boardId, $title);
$boardLabels = $this->labelMapper->findAll($boardId);
foreach($boardLabels as $boardLabel) {
if ($boardLabel->getTitle() === $title) {
throw new BadRequestException('title must be unique');
break;
}
}
if ($this->boardService->isArchived(null, $boardId)) { if ($this->boardService->isArchived(null, $boardId)) {
throw new StatusException('Operation not allowed. This board is archived.'); throw new StatusException('Operation not allowed. This board is archived.');
@@ -157,7 +164,18 @@ 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); //$this->checkDuplicateTitle($label->getBoardId(), $title);
$boardLabels = $this->labelMapper->findAll($label->getBoardId());
foreach($boardLabels as $boardLabel) {
if ($boardLabel->getId() === $label->getId()) {
continue;
}
if ($boardLabel->getTitle() === $title) {
throw new BadRequestException('title must be unique');
break;
}
}
if ($this->boardService->isArchived($this->labelMapper, $id)) { if ($this->boardService->isArchived($this->labelMapper, $id)) {
throw new StatusException('Operation not allowed. This board is archived.'); throw new StatusException('Operation not allowed. This board is archived.');