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

More fixes

Browse Source
This commit is contained in:
Julius Haertl
2016-07-06 09:00:25 +02:00
parent 0330c01600
commit 4fb6248336
8 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/app/App.js
View File

@@ -26,3 +26,7 @@ var app = angular.module('Deck', [
'ngAnimate'
]);
$('link[rel="shortcut icon"]').attr(
'href',
OC.filePath('deck', 'img', 'app-512.png')
);

2
js/controller/BoardController.js
View File

@@ -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();

22
js/public/app.js
View File

@@ -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;
}]);

16
js/service/BoardService.js
View File

@@ -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;
});