diff --git a/controller/sharecontroller.php b/controller/sharecontroller.php index bb5c86cde..01fcee975 100644 --- a/controller/sharecontroller.php +++ b/controller/sharecontroller.php @@ -29,17 +29,17 @@ class ShareController extends Controller { public function searchUser($search) { $limit = null; $offset = null; + $result = []; $groups = []; foreach ($this->groupManager->search($search, $limit, $offset) as $group) { $groups[] = $group->getGID(); + $result[] = array('type'=>'group', 'id'=>$group->getGID()); } $users = []; foreach ($this->userManager->searchDisplayName($search, $limit, $offset) as $user) { $users[] = $user->getDisplayName(); + $result[] = array('type'=>'group', 'id'=>$user->getUID(), 'displayName'=>$user->getDisplayName()); } - return array( - 'users' => $users, - 'groups' => $groups - ); + return $result; } } diff --git a/img/app-512.png b/img/app-512.png new file mode 100644 index 000000000..1ab7022c6 Binary files /dev/null and b/img/app-512.png differ diff --git a/img/app.svg b/img/app.svg index 6f4791d46..b75c2e8bd 100644 --- a/img/app.svg +++ b/img/app.svg @@ -1,77 +1,26 @@ - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/js/app/App.js b/js/app/App.js index 8072d1c32..8828e3cfe 100644 --- a/js/app/App.js +++ b/js/app/App.js @@ -26,3 +26,7 @@ var app = angular.module('Deck', [ 'ngAnimate' ]); +$('link[rel="shortcut icon"]').attr( + 'href', + OC.filePath('deck', 'img', 'app-512.png') +); diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index 24dcdaf9c..193804541 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -28,6 +28,8 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St $scope.statusservice.setError('Error occured', error); }); + BoardService.searchUsers(); + console.log(BoardService.sharees); BoardService.fetchOne($scope.id).then(function(data) { $scope.statusservice.releaseWaiting(); diff --git a/js/public/app.js b/js/public/app.js index 7a6b6fea7..e5ea32166 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -27,6 +27,10 @@ var app = angular.module('Deck', [ 'ngAnimate' ]); +$('link[rel="shortcut icon"]').attr( + 'href', + OC.filePath('deck', 'img', 'app-512.png') +); app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider) { 'use strict'; @@ -130,6 +134,8 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat $scope.statusservice.setError('Error occured', error); }); + BoardService.searchUsers(); + console.log(BoardService.sharees); BoardService.fetchOne($scope.id).then(function(data) { $scope.statusservice.releaseWaiting(); @@ -628,6 +634,22 @@ app.factory('BoardService', ["ApiService", "$http", "$q", function(ApiService, $ ApiService.call(this, $http, ep, $q); }; BoardService.prototype = angular.copy(ApiService.prototype); + + BoardService.prototype.searchUsers = function() { + var url = OC.generateUrl('/apps/deck/share/search/%'); + var deferred = $q.defer(); + var self = this; + this.sharees = []; + $http.get(url).then(function (response) { + self.sharees = response.data.users; + console.log(this.sharees); + deferred.resolve(response.data); + }, function (error) { + deferred.reject('Error while update ' + self.endpoint); + }); + return deferred.promise; + } + service = new BoardService($http, 'boards', $q) return service; }]); diff --git a/js/service/BoardService.js b/js/service/BoardService.js index 7d85e8eb3..e63a6f084 100644 --- a/js/service/BoardService.js +++ b/js/service/BoardService.js @@ -3,6 +3,22 @@ app.factory('BoardService', function(ApiService, $http, $q){ ApiService.call(this, $http, ep, $q); }; BoardService.prototype = angular.copy(ApiService.prototype); + + BoardService.prototype.searchUsers = function() { + var url = OC.generateUrl('/apps/deck/share/search/%'); + var deferred = $q.defer(); + var self = this; + this.sharees = []; + $http.get(url).then(function (response) { + self.sharees = response.data.users; + console.log(this.sharees); + deferred.resolve(response.data); + }, function (error) { + deferred.reject('Error while update ' + self.endpoint); + }); + return deferred.promise; + } + service = new BoardService($http, 'boards', $q) return service; }); \ No newline at end of file diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php index dec37b8d7..4b121709d 100644 --- a/templates/part.board.sidebarView.php +++ b/templates/part.board.sidebarView.php @@ -17,7 +17,15 @@
- + + + {{$item.id}} + + {{ sharee.id }} + + +