nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-09-06 21:14:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix csv import log style

Browse source
This commit is contained in:
binsky 2023-06-28 02:33:25 +02:00
parent ca826072bd
commit 369bbff510
No known key found for this signature in database
GPG key ID: B438F7FA2E3AC98F
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/templates.js
View file

@ -63,7 +63,7 @@ angular.module('views/partials/forms/settings/general_settings.html', []).run(['
angular.module('views/partials/forms/settings/generic_csv_import.html', []).run(['$templateCache', function($templateCache) {
'use strict';
$templateCache.put('views/partials/forms/settings/generic_csv_import.html',
'<div ng-controller="GenericCsvImportCtrl"><div class="row margin-bottom-25"><div class="col-xs-12 col-md-3"><div>{{ \'select.csv\' | translate}} <input type="file" file-select accept=".csv" success="csvLoaded"></div><div ng-show="parsed_csv"><span translate="parsed.csv.rows" translate-value-rows="{{ parsed_csv.length }}"></span></div><div ng-show="parsed_csv"><input id="skipFirstRow" class="checkbox" type="checkbox" ng-model="skipFirstRow"> <label for="skipFirstRow">{{\'skip.first.row\' | translate}}</label></div><div ng-show="import_fields.indexOf(\'label\') === -1 && parsed_csv"><b>{{ \'import.csv.label.req\' | translate}}</b></div><div ng-show="import_fields.indexOf(\'label\') !== -1 && parsed_csv"><button class="btn btn-success" ng-disabled="importing" ng-click="startCSVImport()"><i class="fa fa-spinner fa-spin" ng-show="importing"></i> {{ (importing) ? (\'import.importing\' | translate) : (\'import.start\' | translate) }}</button></div><div><div ng-if="import_progress.progress > 0">{{ \'upload.progress\' | translate}}<div progress-bar="import_progress.progress" index="import_progress.loaded" total="import_progress.total"></div></div></div><div><div ng-if="log" class="import_log"><textarea id="import_log" auto-scroll="log">{{log.join(\'\\n\')}}</textarea></div></div></div></div><div class="row"><div class="col-xs-12 display-grid" ng-show="parsed_csv"><b>{{ \'first.five.lines\' | translate }}</b><br>{{ \'assign.column\' | translate }}<div class="import-table-outter margin-bottom-25"><table class="import-table"><tr ng-repeat="line in parsed_csv | limitTo:5"><td class="inspect"><i class="fa fa-search" ng-click="inspectCredential(line)" ng-if="($index > 0 && matched && import_fields.length > 0) || ($index >= 0 && !matched && import_fields.length > 0)"></i></td><td ng-repeat="prop in line track by $index">{{line[$index] | limitTo: 100}}</td></tr><tr ng-repeat="line in parsed_csv | limitTo:1"><td></td><td ng-repeat="prop in line track by $index"><select ng-model="import_fields[$index]" ng-change="updateExample()" ng-options="property.prop as property.label for property in credentialProperties"></select></td></tr></table></div><div ng-show="inspected_credential && import_fields.length > 0"><b>{{ \'example.credential\' | translate}}</b><div credential-template credential="inspected_credential" show-label></div></div></div></div></div>');
'<div ng-controller="GenericCsvImportCtrl"><div class="row margin-bottom-25"><div class="col-xs-12 col-md-3"><div>{{ \'select.csv\' | translate}} <input type="file" file-select accept=".csv" success="csvLoaded" error="fileLoadError" progress="fileSelectProgress"></div><div ng-show="parsed_csv"><span translate="parsed.csv.rows" translate-value-rows="{{ parsed_csv.length }}"></span></div><div ng-show="parsed_csv"><input id="skipFirstRow" class="checkbox" type="checkbox" ng-model="skipFirstRow"> <label for="skipFirstRow">{{\'skip.first.row\' | translate}}</label></div><div ng-show="import_fields.indexOf(\'label\') === -1 && parsed_csv"><b>{{ \'import.csv.label.req\' | translate}}</b></div><div ng-show="import_fields.indexOf(\'label\') !== -1 && parsed_csv"><button class="btn btn-success" ng-disabled="importing" ng-click="startCSVImport()"><i class="fa fa-spinner fa-spin" ng-show="importing"></i> {{ (importing) ? (\'import.importing\' | translate) : (\'import.start\' | translate) }}</button></div><div><div ng-if="import_progress.progress > 0">{{ \'upload.progress\' | translate}}<div progress-bar="import_progress.progress" index="import_progress.loaded" total="import_progress.total"></div></div></div></div><div class="col-xs-12 col-md-9"><div ng-if="log" class="import_log"><textarea id="import_log" auto-scroll="log">{{log.join(\'\\n\')}}</textarea></div></div></div><div class="row"><div class="col-xs-12 display-grid" ng-show="parsed_csv"><b>{{ \'first.five.lines\' | translate }}</b><br>{{ \'assign.column\' | translate }}<div class="import-table-outter margin-bottom-25"><table class="import-table"><tr ng-repeat="line in parsed_csv | limitTo:5"><td class="inspect"><i class="fa fa-search" ng-click="inspectCredential(line)" ng-if="($index > 0 && matched && import_fields.length > 0) || ($index >= 0 && !matched && import_fields.length > 0)"></i></td><td ng-repeat="prop in line track by $index">{{"" + prop | limitTo: 100}}</td></tr><tr ng-repeat="line in parsed_csv | limitTo:1"><td></td><td ng-repeat="prop in line track by $index"><select ng-model="import_fields[$index]" ng-change="updateExample()" ng-options="property.prop as property.label for property in credentialProperties"></select></td></tr></table></div><div ng-show="inspected_credential && import_fields.length > 0"><b>{{ \'example.credential\' | translate}}</b><div credential-template credential="inspected_credential" show-label></div></div></div></div></div>');
}]);
angular.module('views/partials/forms/settings/import.html', []).run(['$templateCache', function($templateCache) {

14
templates/views/partials/forms/settings/generic_csv_import.html
View file

@ -3,7 +3,7 @@
<div class="col-xs-12 col-md-3">
<div>{{ 'select.csv' | translate}}
<input type="file" file-select accept=".csv"
success="csvLoaded">
success="csvLoaded" error="fileLoadError" progress="fileSelectProgress">
</div>
<div ng-show="parsed_csv">
<span translate="parsed.csv.rows" translate-value-rows="{{ parsed_csv.length }}">
@ -26,12 +26,12 @@
<div progress-bar="import_progress.progress" index="import_progress.loaded" total="import_progress.total"></div>
</div>
</div>
<div>
<div ng-if="log" class="import_log">
<textarea id="import_log" auto-scroll="log">{{log.join('\n')}}</textarea>
</div>
</div>
</div>
<div class="col-xs-12 col-md-9">
<div ng-if="log" class="import_log">
<textarea id="import_log" auto-scroll="log">{{log.join('\n')}}</textarea>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 display-grid" ng-show="parsed_csv">
@ -45,7 +45,7 @@
ng-if="($index > 0 && matched && import_fields.length > 0) || ($index >= 0 && !matched && import_fields.length > 0)"></i>
</td>
<td ng-repeat="prop in line track by $index">
{{line[$index] | limitTo: 100}}
{{"" + prop | limitTo: 100}}
</td>
</tr>
<tr ng-repeat="line in parsed_csv | limitTo:1">