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.

Sign up for GitHub

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

Jump to bottom

Relation controller popup: fix size, add cssClass and allowDismiss #1044

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Relation controller popup: fix size, add cssClass and allowDismiss #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5708357
Update RelationController.php
AIC-BV Jan 22, 2024
72c6238
Update popup.js
AIC-BV Jan 22, 2024
b078572
Update storm-min.js
AIC-BV Jan 22, 2024
21edb7f
Update winter.relation.js
AIC-BV Jan 22, 2024
bde98dd
[fix] missing properties
AIC-BV Jan 22, 2024
4ec18a0
[fix] size is not filled in
AIC-BV Jan 22, 2024
fc77e5b
[add] allowDismiss
AIC-BV Feb 23, 2024
137b717
[add] allowDismiss
AIC-BV Feb 23, 2024
c296dbe
[add] allowDismiss
AIC-BV Feb 23, 2024
55701c2
[add] allowDismiss
AIC-BV Feb 23, 2024
3a1511a
Update popup.js
AIC-BV Aug 28, 2024
f4bf2ec
Update storm-min.js
AIC-BV Aug 28, 2024
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
10 changes: 8 additions & 2 deletions modules/backend/behaviors/RelationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,12 +673,18 @@ protected function makeViewWidget()
$config->recordUrl = $this->getConfig('view[recordUrl]');
$config->customViewPath = $this->getConfig('view[customViewPath]');
$config->noRecordsMessage = $this->getConfig('view[noRecordsMessage]');
$config->size = $this->getConfig('manage[size]');
$config->cssClass = $this->getConfig('manage[cssClass]');
$config->allowDismiss = $this->getConfig('manage[allowDismiss]');

$defaultOnClick = sprintf(
"$.wn.relationBehavior.clickViewListRecord(':%s', '%s', '%s')",
"$.wn.relationBehavior.clickViewListRecord(':%s', '%s', '%s', '%s', '%s', '%s')",
$this->relationModel->getKeyName(),
$this->relationGetId(),
$this->relationGetSessionKey()
$this->relationGetSessionKey(),
$config->size,
$config->cssClass,
$config->allowDismiss
);

if ($config->recordUrl) {
Expand Down
10 changes: 8 additions & 2 deletions modules/backend/behaviors/relationcontroller/assets/js/winter.relation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@
$(el).closest('.control-list').listWidget('toggleChecked', [el])
}

this.clickViewListRecord = function(recordId, relationId, sessionKey) {
this.clickViewListRecord = function(recordId, relationId, sessionKey, size, cssClass, allowDismiss) {
var newPopup = $('<a />'),
$container = $('#'+relationId),
requestData = paramToObj('data-request-data', $container.data('request-data'))

if (!size) {
size = 'huge'
}

newPopup.popup({
handler: 'onRelationClickViewList',
size: 'huge',
size: size,
cssClass: cssClass,
allowDismiss: allowDismiss,
extraData: $.extend({}, requestData, {
'manage_id': recordId,
'_session_key': sessionKey
Expand Down
18 changes: 17 additions & 1 deletion modules/system/assets/ui/js/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
content: null,
size: null,
adaptiveHeight: false,
zIndex: null
zIndex: null,
cssClass: null,
allowDismiss: false
}

Popup.prototype.init = function(){
Expand Down Expand Up @@ -207,8 +209,22 @@
if (this.options.adaptiveHeight)
modalDialog.addClass('adaptive-height')

if (this.options.cssClass)
modalDialog.addClass(this.options.cssClass)

if (this.options.zIndex !== null)
modal.css('z-index', this.options.zIndex + 20)

if (this.options.allowDismiss) {
modal.on('mousedown', function(e) {
const target = e.target;
if (target.classList.contains('control-popup')) {
modal.hide()
$('.popup-backdrop').remove()
$(document.body).removeClass('modal-open')
}
});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were you able to get the change monitoring to work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No there is no change monitor.
I remember trying to add it but it was looking at the main record instead of the related record

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jaxwilko is this something you could take a look at? I'm concerned that if we add this functionality without that as a failsafe it could make accidental data loss for users too easy when in theory it shouldn't be too difficult to add the change monitoring before we merge this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AIC-BV were you looking at https://wintercms.com/docs/v1.2/ui/script/input-monitor? (https://github.com/wintercms/winter/blob/develop/modules/system/assets/ui/js/input.monitor.js)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes


return modal.append(modalDialog.append(modalContent))
}
Expand Down
12 changes: 8 additions & 4 deletions modules/system/assets/ui/storm-min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading