Skip to content

[Forwardport] Replaced @escapeNotVerified annotations #17812

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

Merged
merged 1 commit into from
Sep 4, 2018
Merged

[Forwardport] Replaced @escapeNotVerified annotations #17812

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
24 changes: 13 additions & 11 deletions app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,34 @@
?>

<?php if ($_item = $block->getItem()): ?>
<div id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"
<div id="order_item_<?= $block->escapeHtml($_item->getId()) ?>_title"
class="product-title">
<?= $block->escapeHtml($_item->getName()) ?>
</div>

<div class="product-sku-block">
<span><?= /* @escapeNotVerified */ __('SKU') ?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
<span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
</div>

<?php if ($block->getOrderOptions()): ?>
<dl class="item-options">
<?php foreach ($block->getOrderOptions() as $_option): ?>
<dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
<dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
<dd>
<?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
<?= /* @escapeNotVerified */ $block->getCustomizedOptionValue($_option) ?>
<?= $block->escapeHtml($block->getCustomizedOptionValue($_option)) ?>
<?php else: ?>
<?php $_option = $block->getFormattedOption($_option['value']); ?>
<?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?= /* @escapeNotVerified */ $_dots = 'dots' . uniqid() ?>"> ...</span><span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_option['remainder'] ?></span>
<?php $dots = 'dots' . uniqid(); ?>
<?= $block->escapeHtml($_option['value']) ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
<?php $id = 'id' . uniqid(); ?>
<span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder']) ?></span>
<script>
require(['prototype'], function() {
$('<?= /* @escapeNotVerified */ $_id ?>').hide();
$('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
$('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_dots ?>').hide();});
$('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout', function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
$('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout', function(){$('<?= /* @escapeNotVerified */ $_dots ?>').show();});
$('<?= /* @noEscape */ $id; ?>').hide();
$('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $id; ?>').show();});
$('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $dots; ?>').hide();});
$('<?= /* @noEscape */ $id; ?>').up().observe('mouseout', function(){$('<?= /* @noEscape */ $id; ?>').hide();});
$('<?= /* @noEscape */ $id; ?>').up().observe('mouseout', function(){$('<?= /* @noEscape */ $dots; ?>').show();});
});
</script>
<?php endif; ?>
Expand Down
30 changes: 15 additions & 15 deletions app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@
// @codingStandardsIgnoreFile

?>
<?php if ($_item = $block->getItem()): ?>
<?php if ($item = $block->getItem()): ?>
<table class="qty-table">
<tr>
<th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
<td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
<th><?= $block->escapeHtml(__('Ordered')); ?></th>
<td><?= /* @noEscape */ $item->getQtyOrdered()*1 ?></td>
</tr>

<?php if ((float) $_item->getQtyInvoiced()): ?>
<?php if ((float) $item->getQtyInvoiced()): ?>
<tr>
<th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
<td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
<th><?= $block->escapeHtml(__('Invoiced')); ?></th>
<td><?= /* @noEscape */ $item->getQtyInvoiced()*1 ?></td>
</tr>
<?php endif; ?>

<?php if ((float) $_item->getQtyShipped()): ?>
<?php if ((float) $item->getQtyShipped()): ?>
<tr>
<th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
<td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
<th><?= $block->escapeHtml(__('Shipped')); ?></th>
<td><?= /* @noEscape */ $item->getQtyShipped()*1 ?></td>
</tr>
<?php endif; ?>

<?php if ((float) $_item->getQtyRefunded()): ?>
<?php if ((float) $item->getQtyRefunded()): ?>
<tr>
<th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
<td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
<th><?= $block->escapeHtml(__('Refunded')); ?></th>
<td><?= /* @noEscape */ $item->getQtyRefunded()*1 ?></td>
</tr>
<?php endif; ?>

<?php if ((float) $_item->getQtyCanceled()): ?>
<?php if ((float) $item->getQtyCanceled()): ?>
<tr>
<th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
<td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
<th><?= $block->escapeHtml(__('Canceled')); ?></th>
<td><?= /* @noEscape */ $item->getQtyCanceled()*1 ?></td>
</tr>
<?php endif; ?>

Expand Down