dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed fields names

Browse Source
This commit is contained in:
Dima Landiak 2018-03-12 20:36:52 +02:00
parent 72a202dd5b
commit 8cb79bfc08
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/extension/extensions-forms/extension-form-opc.directive.js
View File

@ -128,8 +128,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra
let addedFile = event.target.result;
if (addedFile && addedFile.length > 0) {
model[options.fileName] = $file.name;
model[options.location] = addedFile.replace(/^data.*base64,/, "");
model[options.location] = $file.name;
model[options.fileContent] = addedFile.replace(/^data.*base64,/, "");
}
}
@ -142,8 +142,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra
scope.clearFile = function(model, options) {
scope.theForm.$setDirty();
model[options.fileName] = null;
model[options.location] = null;
model[options.fileContent] = null;
};

10
ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html
View File

@ -212,8 +212,8 @@
</md-input-container>
<section class="dropdown-section">
<div class="tb-container" ng-class="{'ng-invalid':!server.keystore.location}">
<span ng-init='fieldsToFill = {"fileName":"fileName", "location":"location"}'></span>
<div class="tb-container" ng-class="{'ng-invalid':!server.keystore.fileContent}">
<span ng-init='fieldsToFill = {"location":"location", "fileContent":"fileContent"}'></span>
<label class="tb-label" translate>extension.opc-keystore-location</label>
<div flow-init="{singleFile:true}" flow-file-added='fileAdded($file, server.keystore, fieldsToFill)' class="tb-file-select-container">
<div class="tb-file-clear-container">
@ -231,14 +231,14 @@
class="file-input"
flow-btn id="dropFileKeystore_{{serverIndex}}"
name="keystoreFile"
ng-model="server.keystore.location"
ng-model="server.keystore.fileContent"
>
</div>
</div>
</div>
<div class="dropdown-messages">
<div ng-if="!server.keystore[fieldsToFill.fileName]" class="tb-error-message" translate>extension.no-file</div>
<div ng-if="server.keystore[fieldsToFill.fileName]">{{server.keystore[fieldsToFill.fileName]}}</div>
<div ng-if="!server.keystore[fieldsToFill.location]" class="tb-error-message" translate>extension.no-file</div>
<div ng-if="server.keystore[fieldsToFill.location]">{{server.keystore[fieldsToFill.location]}}</div>
</div>
</section>