Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

angularjs directive closing tag #540

Merged
merged 2 commits into from
Jul 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE

## 3.4.1

+ [#539](https://github.com/luyadev/luya-module-admin/issues/539) Fix issue with angularjs directive closing tags which has been introduced in version 1.8.0
+ [#536](https://github.com/luyadev/luya-module-admin/issues/536) Fix issue where security schemas where added but not applied to the Operations.
+ [#534](https://github.com/luyadev/luya-module-admin/pull/534) Using `fields()` when working with ActiveRecords as it represents the REST resource information.
+ [#533](https://github.com/luyadev/luya-module-admin/pull/533) Fixed a bug where OpenApi property relations won't expand.
Expand Down
2 changes: 1 addition & 1 deletion src/resources/dist/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/resources/js/directives.js
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ zaa.directive("zaaAsyncValue", function () {
};
}],
template: function () {
return '<div class="form-group form-side-by-side" ng-class="{\'input--hide-label\': i18n}"><div class="form-side form-side-label"><label for="{{id}}">{{label}}</label></div><div class="form-side"><async-value model="model" api="{{api}}" fields="fields" ng-show="model" /><button type="button" class="btn btn-icon btn-cancel" ng-click="resetValue()" ng-show="model"></button></div></div>';
return '<div class="form-group form-side-by-side" ng-class="{\'input--hide-label\': i18n}"><div class="form-side form-side-label"><label for="{{id}}">{{label}}</label></div><div class="form-side"><async-value model="model" api="{{api}}" fields="fields" ng-show="model"></async-value><button type="button" class="btn btn-icon btn-cancel" ng-click="resetValue()" ng-show="model"></button></div></div>';
}
}
});
Expand Down Expand Up @@ -1540,7 +1540,7 @@ zaa.directive("zaaSelect", function () {
'<label for="{{id}}">{{label}}</label>' +
'</div>' +
'<div class="form-side">'+
'<luya-select ng-model="model" options="options" id="{{id}}" optionsvalue="{{optionsvalue}}" optionslabel="{{optionslabel}}" initvalue="{{initvalue}}" />' +
'<luya-select ng-model="model" options="options" id="{{id}}" optionsvalue="{{optionsvalue}}" optionslabel="{{optionslabel}}" initvalue="{{initvalue}}"></luya-select>' +
'</div>' +
'</div>';
}
Expand Down
6 changes: 3 additions & 3 deletions src/resources/js/scheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ zaa.directive("luyaSchedule", function() {
'</div>' +
'<div class="inlinemodal-content">' +
'<div class="clearfix">' +
'<zaa-select model="newvalue" options="attributeValues" label="' + i18n['js_scheduler_new_value'] + '" />' +
'<zaa-checkbox model="showDatepicker" fieldid="{{getUniqueFormId(\'datepicker\')}}" label="' + i18n['js_scheduler_show_datepicker'] + '" />'+
'<zaa-datetime ng-show="showDatepicker" model="timestamp" label="' + i18n['js_scheduler_time'] + '" />' +
'<zaa-select model="newvalue" options="attributeValues" label="' + i18n['js_scheduler_new_value'] + '"></zaa-select>' +
'<zaa-checkbox model="showDatepicker" fieldid="{{getUniqueFormId(\'datepicker\')}}" label="' + i18n['js_scheduler_show_datepicker'] + '"></zaa-checkbox>'+
'<zaa-datetime ng-show="showDatepicker" model="timestamp" label="' + i18n['js_scheduler_time'] + '"></zaa-datetime>' +
'<button type="button" class="btn btn-save btn-icon float-right" ng-click="saveNewJob()">' + i18n['js_scheduler_save'] + '</button>' +
'</div>' +

Expand Down
16 changes: 8 additions & 8 deletions src/views/account/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<div class="luya-content" ng-controller="AccountController">
<collapse-container title="<?= Module::t('mode_user_personal_info') ?>" icon="face" class="mb-3">
<form ng-submit="changePersonData(profile)">
<zaa-select fieldid="mode_user_title" model="profile.title" label="<?= Module::t('mode_user_title'); ?>" options="[{value:1, label:'<?= Module::t('model_user_title_mr'); ?>'}, {value:2, label:'<?= Module::t('model_user_title_mrs'); ?>'}]" />
<zaa-text autocomplete="given-name" fieldid="mode_user_firstname" label="<?= Module::t('mode_user_firstname'); ?>" model="profile.firstname" />
<zaa-text autocomplete="family-name" fieldid="mode_user_lastname" label="<?= Module::t('mode_user_lastname'); ?>" model="profile.lastname" />
<zaa-text autocomplete="email" fieldid="mode_user_email" label="<?= Module::t('mode_user_email'); ?>" model="profile.email" />
<zaa-select fieldid="mode_user_title" model="profile.title" label="<?= Module::t('mode_user_title'); ?>" options="[{value:1, label:'<?= Module::t('model_user_title_mr'); ?>'}, {value:2, label:'<?= Module::t('model_user_title_mrs'); ?>'}]"></zaa-select>
<zaa-text autocomplete="given-name" fieldid="mode_user_firstname" label="<?= Module::t('mode_user_firstname'); ?>" model="profile.firstname"></zaa-text>
<zaa-text autocomplete="family-name" fieldid="mode_user_lastname" label="<?= Module::t('mode_user_lastname'); ?>" model="profile.lastname"></zaa-text>
<zaa-text autocomplete="email" fieldid="mode_user_email" label="<?= Module::t('mode_user_email'); ?>" model="profile.email"></zaa-text>
<button class="btn btn-save btn-icon" type="submit"><?= Module::t('layout_rightbar_savebtn'); ?></button>

</form>
Expand All @@ -20,7 +20,7 @@
<p class="mb-0"><?= Module::t('account_changeemail_enterverificationtoken')?></p>
</div>
<form ng-submit="changeEmail()">
<zaa-text fieldid="mode_email_token" label="<?= Module::t('model_user_email_verification_token')?>" model="email.token" />
<zaa-text fieldid="mode_email_token" label="<?= Module::t('model_user_email_verification_token')?>" model="email.token"></zaa-text>
<button class="btn btn-save btn-icon" type="submit"><?= Module::t('layout_rightbar_savebtn'); ?></button>
</form>
</div>
Expand Down Expand Up @@ -53,10 +53,10 @@

<collapse-container title="<?= Module::t('mode_user_password') ?>" icon="vpn_key" class="mb-3">
<form ng-submit="changePassword()">
<zaa-password autocomplete="current-password" fieldid="model_user_oldpassword" label="<?= Module::t('model_user_oldpassword'); ?>" model="pass.oldpass" />
<zaa-password autocomplete="current-password" fieldid="model_user_oldpassword" label="<?= Module::t('model_user_oldpassword'); ?>" model="pass.oldpass"></zaa-password>
<hr class="mb-4" />
<zaa-password autocomplete="new-password" fieldid="aws_changepassword_new_pass" label="<?= Module::t('aws_changepassword_new_pass'); ?>" model="pass.newpass" />
<zaa-password autocomplete="new-password" fieldid="aws_changepassword_new_pass_retry" label="<?= Module::t('aws_changepassword_new_pass_retry'); ?>" model="pass.newpassrepeat" />
<zaa-password autocomplete="new-password" fieldid="aws_changepassword_new_pass" label="<?= Module::t('aws_changepassword_new_pass'); ?>" model="pass.newpass"></zaa-password>
<zaa-password autocomplete="new-password" fieldid="aws_changepassword_new_pass_retry" label="<?= Module::t('aws_changepassword_new_pass_retry'); ?>" model="pass.newpassrepeat"></zaa-password>
<button class="btn btn-save btn-icon" type="submit"><?= Module::t('layout_rightbar_savebtn'); ?></button>
</form>
</collapse-container>
Expand Down
2 changes: 1 addition & 1 deletion src/views/aws/imageselectcollection/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
?>
<div ng-controller="ActiveWindowGalleryController" class="row">
<div class="col-md-8">
<storage-file-manager selection="true" only-images="true" />
<storage-file-manager selection="true" only-images="true"></storage-file-manager>
</div>
<div class="col-md-4">
<h5><?= Module::t('aws_gallery_images')?></h5>
Expand Down
2 changes: 1 addition & 1 deletion src/views/layouts/_angulardirectives.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</div>
<modal is-modal-hidden="modal.state" modal-title="<?= Admin::t('layout_select_file'); ?>">
<div ng-if="!modal.state">
<storage-file-manager selection="true" />
<storage-file-manager selection="true"></storage-file-manager>
</div>
</modal>
<?php else: ?>
Expand Down
2 changes: 1 addition & 1 deletion src/views/ngrest/crud.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</div>
<?php if (!empty($config->getFilters())): ?>
<div class="col-md-4 col-lg-3 col-xl-3 col-xxxl-2">
<luya-select ng-model="config.filter" initvalue="0" ng-change="changeNgRestFilter()" options='<?= Json::htmlEncode($filters); ?>' />
<luya-select ng-model="config.filter" initvalue="0" ng-change="changeNgRestFilter()" options='<?= Json::htmlEncode($filters); ?>'></luya-select>
</div>
<?php endif; ?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/views/storage/index.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="luya-content">
<storage-file-manager ng-model="$parent.$parent.ngModel" selection="false" />
<storage-file-manager ng-model="$parent.$parent.ngModel" selection="false"></storage-file-manager>
</div>