ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest

Browse Source 
Send assignments OPTION request for phases once only.
This commit is contained in:
Oskar Hahn 2016-01-09 12:05:57 +01:00
commit 96328f033b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openslides/assignments/static/js/assignments/base.js
View File

@ -67,17 +67,26 @@ angular.module('OpenSlidesApp.assignments', [])
]) ])
.factory('Assignment', [ .factory('Assignment', [
'$http',
'DS', 'DS',
'AssignmentRelatedUser', 'AssignmentRelatedUser',
'AssignmentPoll', 'AssignmentPoll',
'jsDataModel', 'jsDataModel',
'gettext', 'gettext',
function (DS, AssignmentRelatedUser, AssignmentPoll, jsDataModel, gettext) { function ($http, DS, AssignmentRelatedUser, AssignmentPoll, jsDataModel, gettext) {
var name = 'assignments/assignment'; var name = 'assignments/assignment';
var phases;
return DS.defineResource({ return DS.defineResource({
name: name, name: name,
useClass: jsDataModel, useClass: jsDataModel,
agendaSupplement: gettext('Election'), agendaSupplement: gettext('Election'),
phases: phases,
getPhases: function () {
if (!this.phases) {
this.phases = $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' });
}
return phases;
},
methods: { methods: {
getResourceName: function () { getResourceName: function () {
return name; return name;

4
openslides/assignments/static/js/assignments/site.js
View File

@ -34,8 +34,8 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
assignments: function(Assignment) { assignments: function(Assignment) {
return Assignment.findAll(); return Assignment.findAll();
}, },
phases: function($http) { phases: function(Assignment) {
return $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' }); return Assignment.getPhases();
} }
} }
}) })