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

Corregido bug por pérdida de id #1682

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Corregido bug por pérdida de id #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Core/Assets/JS/WidgetLibrary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ function widgetLibrarySearch(id) {
action: 'widget-library-search',
active_tab: input.closest('form').find('input[name="activetab"]').val(),
col_name: input.attr("name"),
widget_id: id,
query: $("#modal_" + id + "_q").val(),
sort: $("#modal_" + id + "_s").val(),
unique_id: id,
};

$.ajax({
Expand Down Expand Up @@ -64,8 +64,8 @@ function widgetLibraryUpload(id, file) {
data.append('action', 'widget-library-upload');
data.append('active_tab', input.closest('form').find('input[name="activetab"]').val());
data.append('col_name', input.attr("name"));
data.append('widget_id', id);
data.append('file', file);
data.append('unique_id', id);

$.ajax({
method: "POST",
Expand Down
18 changes: 9 additions & 9 deletions Core/Lib/ExtendedController/PanelController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,13 @@ protected function insertAction()

protected function widgetLibrarySearchAction(): array
{
// localizamos la pestaña y el nombre de la columna
// localizamos la pestaña, el nombre de la columna y el unique id
$activeTab = $this->request->request->get('active_tab', '');
$colName = $this->request->request->get('col_name', '');
$widgetId = $this->request->request->get('widget_id', '');
$uniqueId = (int)$this->request->request->get('unique_id', -1);

// si está vacío, no hacemos nada
if (empty($activeTab) || empty($colName)) {
if (empty($activeTab) || empty($colName) || $uniqueId < 0) {
return ['records' => 0, 'html' => ''];
}

Expand All @@ -414,22 +414,22 @@ protected function widgetLibrarySearchAction(): array
$this->request->request->get('sort', '')
);

$selectedValue = (int)$column->widget->plainText($this->tab($activeTab)->model);
$selected_value = (int)$column->widget->plainText($this->tab($activeTab)->model);
return [
'html' => $column->widget->renderFileList($files, $selectedValue, $widgetId),
'html' => $column->widget->renderFileList($uniqueId, $files, $selected_value),
'records' => count($files),
];
}

protected function widgetLibraryUploadAction(): array
{
// localizamos la pestaña y el nombre de la columna
// localizamos la pestaña, el nombre de la columna y el unique id
$activeTab = $this->request->request->get('active_tab', '');
$colName = $this->request->request->get('col_name', '');
$widgetId = $this->request->request->get('widget_id', '');
$uniqueId = (int)$this->request->request->get('unique_id', -1);

// si está vacío, no hacemos nada
if (empty($activeTab) || empty($colName)) {
if (empty($activeTab) || empty($colName) || $uniqueId < 0) {
return [];
}

Expand All @@ -446,7 +446,7 @@ protected function widgetLibraryUploadAction(): array

$files = $column->widget->files();
return [
'html' => $column->widget->renderFileList($files, $file->idfile, $widgetId),
'html' => $column->widget->renderFileList($uniqueId, $files),
'records' => count($files),
'new_file' => $file->idfile,
'new_filename' => $file->shortFileName(),
Expand Down
56 changes: 26 additions & 30 deletions Core/Lib/Widget/WidgetLibrary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function edit($model, $title = '', $description = '', $titleurl = '')
. '</a>'
. $descriptionHtml
. '</div>'
. $this->renderModal($icon, $label)
. $this->renderModal($icon, $label, $this->id)
. "<script>\n"
. "widgetLibrarySelectStr = '" . Tools::lang()->trans('select') . "';\n"
. "</script>\n";
Expand Down Expand Up @@ -160,7 +160,7 @@ public function files(string $query = '', string $sort = 'date-desc'): array
return $list;
}

public function renderFileList(array $files = [], ?int $selected_value = null, ?string $id = null): string
public function renderFileList(int $id, array $files = [], ?int $selected_value = null): string
{
$html = '';

Expand All @@ -185,7 +185,7 @@ public function renderFileList(array $files = [], ?int $selected_value = null, ?

if ($file->isImage()) {
$html .= '<div class="media">'
. '<img loading="lazy" src="' . $file->url('download-permanent') . '" class="mr-3" alt="' . $file->filename
. '<img src="' . $file->url('download-permanent') . '" class="mr-3" alt="' . $file->filename
. '" width="64" type="button" onclick="' . $js . '" title="' . Tools::lang()->trans('select') . '">'
. '<div class="media-body">'
. '<h5 class="text-break mt-0">' . $file->filename . '</h5>'
Expand Down Expand Up @@ -235,27 +235,27 @@ public function uploadFile(UploadedFile $uploadFile): AttachedFile
return new AttachedFile();
}

protected function renderQueryFilter(): string
protected function renderQueryFilter(int $id): string
{
return '<div class="input-group mb-2">'
. '<input type="text" id="modal_' . $this->id . '_q" class="form-control" placeholder="'
. Tools::lang()->trans('search') . '" onkeydown="widgetLibrarySearchKp(\'' . $this->id . '\', event);">'
. '<input type="text" id="modal_' . $id . '_q" class="form-control" placeholder="'
. Tools::lang()->trans('search') . '" onkeydown="widgetLibrarySearchKp(\'' . $id . '\', event);">'
. '<div class="input-group-append">'
. '<button type="button" class="btn btn-primary" onclick="widgetLibrarySearch(\'' . $this->id . '\');">'
. '<button type="button" class="btn btn-primary" onclick="widgetLibrarySearch(\'' . $id . '\');">'
. '<i class="fas fa-search"></i>'
. '</button>'
. '</div>'
. '</div>';
}

protected function renderModal(string $icon, string $label): string
protected function renderModal(string $icon, string $label, int $id): string
{
return '<div class="modal fade" id="modal_' . $this->id . '" tabindex="-1" aria-labelledby="modal_'
. $this->id . '_label" aria-hidden="true">'
return '<div class="modal fade" id="modal_' . $id . '" tabindex="-1" aria-labelledby="modal_'
. $id . '_label" aria-hidden="true">'
. '<div class="modal-dialog modal-dialog-scrollable modal-lg">'
. '<div class="modal-content">'
. '<div class="modal-header">'
. '<h5 class="modal-title" id="modal_' . $this->id . '_label">'
. '<h5 class="modal-title" id="modal_' . $id . '_label">'
. '<i class="' . $icon . ' mr-1"></i> ' . $label
. '</h5>'
. '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'
Expand All @@ -264,45 +264,41 @@ protected function renderModal(string $icon, string $label): string
. '</div>'
. '<div class="modal-body bg-light">'
. '<div class="form-row">'
. '<div class="col-6">' . $this->renderQueryFilter() . '</div>'
. '<div class="col-6">' . $this->renderSortFilter() . '</div>'
. '</div>'
. '<div id="list_' . $this->id . '" class="form-row pt-3">'
. $this->renderFileList([], $this->value, $this->id)
. '</div>'
. '</div>'
. '<div class="modal-footer p-2">'
. '<div class="col">'
. '<div class="custom-file">'
. '<input type="file" class="custom-file-input" id="modal_' . $this->id . '_f" accept="' . $this->accept
. '" onchange="widgetLibraryUpload(\'' . $this->id . '\', this.files[0]);">'
. '<label class="custom-file-label" for="modal_' . $this->id . '_f" data-browse="' . Tools::lang()->trans('select')
. '<div class="col-12">'
. '<div class="custom-file mb-2">'
. '<input type="file" class="custom-file-input" id="modal_' . $id . '_f" accept="' . $this->accept
. '" onchange="widgetLibraryUpload(\'' . $id . '\', this.files[0]);">'
. '<label class="custom-file-label" for="modal_' . $id . '_f" data-browse="' . Tools::lang()->trans('select')
. '">' . Tools::lang()->trans('add-file') . '</label>'
. '</div>'
. '</div>'
. '<div class="col">'
. $this->renderSelectNoneBtn()
. '<div class="col-6">' . $this->renderQueryFilter($id) . '</div>'
. '<div class="col-6">' . $this->renderSortFilter($id) . '</div>'
. '</div>'
. '<div id="list_' . $id . '" class="form-row pt-3">'
. $this->renderFileList($id)
. '</div>'
. '</div>'
. '<div class="modal-footer p-2">' . $this->renderSelectNoneBtn($id) . '</div>'
. '</div>'
. '</div>'
. '</div>';
}

protected function renderSelectNoneBtn(): string
protected function renderSelectNoneBtn(int $id): string
{
if ($this->required) {
return '';
}

return '<a href="#" class="btn btn-block btn-secondary" onclick="widgetLibrarySelect(\'' . $this->id . '\', \'\', \'' . Tools::lang()->trans('select') . '\');">'
return '<a href="#" class="btn btn-block btn-secondary" onclick="widgetLibrarySelect(\'' . $id . '\', \'\', \'' . Tools::lang()->trans('select') . '\');">'
. '<i class="fas fa-times mr-1"></i>' . Tools::lang()->trans('none')
. '</a>';
}

protected function renderSortFilter(): string
protected function renderSortFilter(int $id): string
{
return '<select class="form-control mb-2" id="modal_' . $this->id . '_s" onchange="widgetLibrarySearch(\'' . $this->id . '\');">'
return '<select class="form-control mb-2" id="modal_' . $id . '_s" onchange="widgetLibrarySearch(\'' . $id . '\');">'
. '<option value="date-asc">' . Tools::lang()->trans('sort-by-date-asc') . '</option>'
. '<option value="date-desc" selected>' . Tools::lang()->trans('sort-by-date-desc') . '</option>'
. '</select>';
Expand Down