From 4fb62483360a3255f7dda04a82fc7da6e33fdad3 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Wed, 6 Jul 2016 09:00:25 +0200 Subject: [PATCH] More fixes --- controller/sharecontroller.php | 8 +-- img/app-512.png | Bin 0 -> 3160 bytes img/app.svg | 101 +++++++-------------------- js/app/App.js | 4 ++ js/controller/BoardController.js | 2 + js/public/app.js | 22 ++++++ js/service/BoardService.js | 16 +++++ templates/part.board.sidebarView.php | 10 ++- 8 files changed, 82 insertions(+), 81 deletions(-) create mode 100644 img/app-512.png 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 0000000000000000000000000000000000000000..1ab7022c6e6486c4f9d2a28158580fbc8fdcc4e3 GIT binary patch literal 3160 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 Dw_>gF literal 0 HcmV?d00001 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 }} + + +