mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-21 17:11:38 +00:00
fix output of message when item was deleted
This commit is contained in:
parent
277fe6d5ad
commit
b374e8e962
|
@ -147,13 +147,13 @@ $('#update-transmittalitem-btn-".$itemid."').popover({
|
||||||
function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
|
function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
|
||||||
$itemid = $item->getID();
|
$itemid = $item->getID();
|
||||||
$content = '';
|
$content = '';
|
||||||
$content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.getMLText($msg).'"><i class="icon-remove"></i></a>';
|
$content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'"><i class="icon-remove"></i></a>';
|
||||||
$this->addFooterJS("
|
$this->addFooterJS("
|
||||||
$('#delete-transmittalitem-btn-".$itemid."').popover({
|
$('#delete-transmittalitem-btn-".$itemid."').popover({
|
||||||
title: '".getMLText("rm_transmittalitem")."',
|
title: '".getMLText("rm_transmittalitem")."',
|
||||||
placement: 'left',
|
placement: 'left',
|
||||||
html: true,
|
html: true,
|
||||||
content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".getMLText($msg)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$("#delete-transmittalitem-btn-".$itemid."").popover("hide");'>".getMLText('cancel')."</button></div>\"});
|
content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".htmlspecialchars($msg, ENT_QUOTES)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$("#delete-transmittalitem-btn-".$itemid."").popover("hide");'>".getMLText('cancel')."</button></div>\"});
|
||||||
");
|
");
|
||||||
if($return)
|
if($return)
|
||||||
return $content;
|
return $content;
|
||||||
|
@ -237,7 +237,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
|
||||||
print "<thead>\n<tr>\n";
|
print "<thead>\n<tr>\n";
|
||||||
print "<th>".getMLText("name")."</th>\n";
|
print "<th>".getMLText("name")."</th>\n";
|
||||||
print "<th>".getMLText("comment")."</th>\n";
|
print "<th>".getMLText("comment")."</th>\n";
|
||||||
print "<th>".getMLText("size")."</th>\n";
|
print "<th>".getMLText("transmittal_size")."</th>\n";
|
||||||
print "<th></th>\n";
|
print "<th></th>\n";
|
||||||
print "</tr>\n</thead>\n<tbody>\n";
|
print "</tr>\n</thead>\n<tbody>\n";
|
||||||
foreach($transmittals as $transmittal) {
|
foreach($transmittals as $transmittal) {
|
||||||
|
@ -285,7 +285,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
|
||||||
echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
|
echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
|
||||||
echo $this->documentListRow($document, $previewer, true, $content->getVersion());
|
echo $this->documentListRow($document, $previewer, true, $content->getVersion());
|
||||||
echo "<td><div class=\"list-action\">";
|
echo "<td><div class=\"list-action\">";
|
||||||
$this->printDeleteItemButton($item, '');
|
$this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
|
||||||
if($latestcontent->getVersion() != $content->getVersion())
|
if($latestcontent->getVersion() != $content->getVersion())
|
||||||
$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
|
$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
|
||||||
echo "</div></td>";
|
echo "</div></td>";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user