mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix picker widget options due to yii2 update data-* handling.

Browse Source
This commit is contained in:
buddh4 2019-12-10 15:34:45 +01:00
parent ea9c88b269
commit 8b8840a553
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
protected/humhub/modules/ui/form/widgets/BasePicker.php
View File

@ -171,7 +171,7 @@ abstract class BasePicker extends JsInputWidget
*
* @var bool|null
*/
public $addOptions = null;
public $addOptions = false;
/**
@ -404,8 +404,7 @@ abstract class BasePicker extends JsInputWidget
$result = [
'add-options' => $this->addOptions,
'picker-url' => $this->getUrl(),
'picker-focus' => ($this->focus) ? 1 : null,
'disabled-items' => (!$this->disabledItems) ? null : $this->disabledItems,
'picker-focus' => $this->focus,
'maximum-selection-length' => $this->maxSelection,
'maximum-input-length' => $this->maxInput,
'minimum-input-length' => $this->minInput,
@ -419,6 +418,10 @@ abstract class BasePicker extends JsInputWidget
'default-results' => $this->getDefaultResultData()
];
if(!empty($this->disabledItems)) {
$result['disabled-items'] = $this->disabledItems;
}
if ($this->maxSelection) {
$result['maximum-selected'] = Yii::t('UserModule.chooser', 'This field only allows a maximum of {n,plural,=1{# item} other{# items}}.', ['n' => $this->maxSelection]);
}

26
static/js/humhub/humhub.ui.picker.js
View File

@ -81,7 +81,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Mapping between select2 search parameter and our picker parameter.
*
*
* @param {type} params select2 search parameter
*/
Picker.prototype.ajaxData = function (params) {
@ -94,12 +94,12 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Used to sort the results of the search queries.
* The sorter takes the following properties into account:
*
*
* - Sort Priority
* - Item text should match the search term
* - IndexOf search term in item text
* - Disabled items at the end.
*
*
* @param {type} results
* @returns {unresolved}
*/
@ -125,7 +125,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Initializes the select2 widget for the given $node with the given $options.
*
*
* @param {type} $node select field node
* @param {type} options widget options
* @returns {undefined}
@ -178,7 +178,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Renders the placeholder if the maximum selection count is not exceeded.
*
*
* @returns {undefined}
*/
Picker.prototype.renderPlaceholder = function (delayed) {
@ -254,7 +254,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Template function for search query results.
*
*
* @param {type} item
* @returns {jQuery|$}
*/
@ -318,7 +318,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Prepares the image node.
*
*
* @param {type} item
* @returns {String}
*/
@ -422,7 +422,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Deselects an option with the given id (value)
*
*
* @param {type} id
* @returns {undefined}
*/
@ -448,7 +448,7 @@ humhub.module('ui.picker', function (module, require, $) {
/**
* Returns an option node by the given id (value)
*
*
* @param {type} id
* @returns {unresolved}
*/
@ -502,7 +502,7 @@ humhub.module('ui.picker', function (module, require, $) {
};
Picker.prototype.isDisabledItem = function (item) {
return (this.options.disabledItems && this.options.disabledItems.indexOf(item.id) >= 0);
return (this.options.disabledItems && object.isArray(this.options.disabledItems) && this.options.disabledItems.indexOf(item.id) >= 0);
};
var init = function () {
@ -518,7 +518,7 @@ humhub.module('ui.picker', function (module, require, $) {
$.fn.select2.amd.define('select2/data/extended-ajax', ['./ajax', '../utils', './minimumInputLength'], function (AjaxAdapter, Utils, MinimumInputLength) {
function ExtendedAjaxAdapter($element, options) {
//we need explicitly process minimumInputLength value
//we need explicitly process minimumInputLength value
//to decide should we use AjaxAdapter or return defaultResults,
//so it is impossible to use MinimumLength decorator here
this.minimumInputLength = options.get('minimumInputLength');
@ -551,7 +551,7 @@ humhub.module('ui.picker', function (module, require, $) {
if (filterResult.length) {
var processedResults = this.processResults(filterResult, params);
callback(processedResults);
callback(processedResults);
} else {
this.container.$results.empty();
}
@ -571,4 +571,4 @@ humhub.module('ui.picker', function (module, require, $) {
init: init,
Picker: Picker
});
});
});