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

Merge pull request #2176 from tsiegleauq/issue2133

Browse Source 
Limit selection of files to csv and txt (Fixed #2133)
This commit is contained in:
Norman Jäckel 2016-06-08 10:41:52 +02:00
commit 13e7e1b1e1
8 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -19,3 +19,4 @@ Authors of OpenSlides in chronological order of first contribution:
Jörn Bensch <bensch@triagonale.de> (Template design)
John Felipe Urrego Mejia <ingenierofelipeurrego@gmail.com> (Spanish translation)
Erik Steenman <eriksteenman@gmail.com>
Sean Engelhardt <sean.f.t.engelhardt@gmail.com>

2
bower.json
View File

@ -8,7 +8,7 @@
"angular-bootstrap": "~0.14.3",
"angular-bootstrap-colorpicker": "~3.0.24",
"angular-chosen-localytics": "~1.4.0",
"angular-csv-import": "~0.0.27",
"angular-csv-import": "~0.0.29",
"angular-formly": "~7.3.9",
"angular-formly-templates-bootstrap": "~6.2.0",
"angular-gettext": "~2.2.0",

2
openslides/agenda/static/js/agenda/site.js
View File

@ -417,6 +417,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
$scope.separator = ',';
$scope.encoding = 'UTF-8';
$scope.encodingOptions = ['UTF-8', 'ISO-8859-1'];
$scope.accept = '.csv, .txt';
$scope.csv = {
content: null,
header: true,
@ -425,6 +426,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
separatorVisible: false,
encoding: $scope.encoding,
encodingVisible: false,
accept: $scope.accept,
result: null
};
// set csv file encoding

1
openslides/agenda/static/templates/agenda/item-import.html
View File

@ -59,6 +59,7 @@ Keep each item in a single line.</p>
separator-visible="csv.separatorVisible"
result="csv.result"
encoding="csv.encoding"
accept="csv.accept"
encoding-visible="csv.encodingVisible"></ng-csv-import>
</div>
</div>

2
openslides/motions/static/js/motions/site.js
View File

@ -824,6 +824,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
$scope.separator = ',';
$scope.encoding = 'UTF-8';
$scope.encodingOptions = ['UTF-8', 'ISO-8859-1'];
$scope.accept = '.csv, .txt';
$scope.csv = {
content: null,
header: true,
@ -832,6 +833,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
separatorVisible: false,
encoding: $scope.encoding,
encodingVisible: false,
accept: $scope.accept,
result: null
};
// set csv file encoding

1
openslides/motions/static/templates/motions/motion-import.html
View File

@ -31,6 +31,7 @@
separator-visible="csv.separatorVisible"
result="csv.result"
encoding="csv.encoding"
accept="csv.accept"
encoding-visible="csv.encodingVisible"></ng-csv-import>
</div>
</div>

2
openslides/users/static/js/users/site.js
View File

@ -688,6 +688,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
$scope.separator = ',';
$scope.encoding = 'UTF-8';
$scope.encodingOptions = ['UTF-8', 'ISO-8859-1'];
$scope.accept = '.csv, .txt';
$scope.csv = {
content: null,
header: true,
@ -696,6 +697,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
separatorVisible: false,
encoding: $scope.encoding,
encodingVisible: false,
accept: $scope.accept,
result: null
};
// set csv file encoding

1
openslides/users/static/templates/users/user-import.html
View File

@ -59,6 +59,7 @@
separator="csv.separator"
separator-visible="csv.separatorVisible"
result="csv.result"
accept="csv.accept"
encoding="csv.encoding"
encoding-visible="csv.encodingVisible"></ng-csv-import>
</div>