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

Merge pull request #2996 from emanuelschuetze/fixes

Browse Source 
Minor fixes from previous pull request reviews.
This commit is contained in:
Norman Jäckel 2017-02-21 17:52:21 +01:00 committed by GitHub
commit cac15db50a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -242,8 +242,7 @@ gulp.task('watch', ['js', 'templates', 'pdf-worker'], function () {
gulp.task('pot', function () {
return gulp.src([
'openslides/core/static/templates/*.html',
'openslides/*/static/templates/*/*.html',
'openslides/*/static/templates/*/*/*.html',
'openslides/*/static/templates/**/*.html',
'openslides/*/static/js/*/*.js',
])
.pipe(gettext.extract('template-en.pot', {}))

3
openslides/motions/static/js/motions/base.js
View File

@ -192,7 +192,6 @@ angular.module('OpenSlidesApp.motions', [
.factory('Motion', [
'DS',
'$http',
'$filter',
'MotionPoll',
'MotionChangeRecommendation',
'MotionComment',
@ -205,7 +204,7 @@ angular.module('OpenSlidesApp.motions', [
'OpenSlidesSettings',
'Projector',
'operator',
function(DS, $http, $filter, MotionPoll, MotionChangeRecommendation, MotionComment, jsDataModel, gettext, gettextCatalog,
function(DS, $http, MotionPoll, MotionChangeRecommendation, MotionComment, jsDataModel, gettext, gettextCatalog,
Config, lineNumberingService, diffService, OpenSlidesSettings, Projector, operator) {
var name = 'motions/motion';
return DS.defineResource({