зеркало из https://github.com/nextcloud/deck.git
Use regular groups endpoint to support Nextcloud 13
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Родитель
3162ff4261
Коммит
8906d12a47
|
@ -65,9 +65,16 @@ var ListController = function ($scope, $location, $filter, BoardService, $elemen
|
|||
$scope.groupLimitDisabled = true;
|
||||
let fetchGroups = function () {
|
||||
var deferred = $q.defer();
|
||||
$http.get(OC.linkToOCS('cloud', 2) + 'groups/details').then(function (response) {
|
||||
$scope.groups = response.data.ocs.data.groups;
|
||||
deferred.resolve(response.data.ocs.data.groups);
|
||||
// TODO: move to groups/details once 15 is min version
|
||||
$http.get(OC.linkToOCS('cloud', 2) + 'groups').then(function (response) {
|
||||
$scope.groups = response.data.ocs.data.groups.reduce((obj, item) => {
|
||||
obj.push({
|
||||
id: item,
|
||||
displayname: item,
|
||||
});
|
||||
return obj;
|
||||
}, []);
|
||||
deferred.resolve($scope.groups);
|
||||
}, function (error) {
|
||||
deferred.reject('Error while loading groups');
|
||||
});
|
||||
|
|
|
@ -106,10 +106,6 @@ class ConfigController extends Controller {
|
|||
return [
|
||||
'id' => $group->getGID(),
|
||||
'displayname' => $group->getDisplayName(),
|
||||
'usercount' => $group->count(),
|
||||
'disabled' => $group->countDisabled(),
|
||||
'canAdd' => $group->canAddUser(),
|
||||
'canRemove' => $group->canRemoveUser(),
|
||||
];
|
||||
}, $groups);
|
||||
return $groups;
|
||||
|
|
|
@ -68,7 +68,9 @@ class PageController extends Controller {
|
|||
];
|
||||
|
||||
if ($this->defaultBoardService->checkFirstRun($this->userId, $this->appName)) {
|
||||
$this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '000000');
|
||||
if ($this->permissionService->canCreate()) {
|
||||
$this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '000000');
|
||||
}
|
||||
}
|
||||
|
||||
return new TemplateResponse('deck', 'main', $params);
|
||||
|
|
|
@ -65,6 +65,10 @@ class PageControllerTest extends \Test\TestCase {
|
|||
->method('checkFirstRun')
|
||||
->willReturn(true);
|
||||
|
||||
$this->permissionService->expects($this->any())
|
||||
->method('canCreate')
|
||||
->willReturn(true);
|
||||
|
||||
$this->defaultBoardService->expects($this->once())
|
||||
->method('createDefaultBoard')
|
||||
->willReturn($board);
|
||||
|
@ -73,6 +77,29 @@ class PageControllerTest extends \Test\TestCase {
|
|||
$this->assertEquals('main', $response->getTemplateName());
|
||||
}
|
||||
|
||||
public function testIndexOnFirstRunNoCreate() {
|
||||
|
||||
$board = new Board();
|
||||
$board->setTitle('Personal');
|
||||
$board->setOwner($this->userId);
|
||||
$board->setColor('000000');
|
||||
|
||||
$this->defaultBoardService->expects($this->once())
|
||||
->method('checkFirstRun')
|
||||
->willReturn(true);
|
||||
|
||||
$this->permissionService->expects($this->any())
|
||||
->method('canCreate')
|
||||
->willReturn(false);
|
||||
|
||||
$this->defaultBoardService->expects($this->never())
|
||||
->method('createDefaultBoard')
|
||||
->willReturn($board);
|
||||
|
||||
$response = $this->controller->index();
|
||||
$this->assertEquals('main', $response->getTemplateName());
|
||||
}
|
||||
|
||||
public function testIndexOnSecondRun() {
|
||||
|
||||
$this->config->setUserValue($this->userId, 'deck', 'firstRun', 'no');
|
||||
|
|
Загрузка…
Ссылка в новой задаче