Merge branch 'sgm_fixbug' into 'master'
* Change product browse order btn. See merge request easycorp/zentaopms!3987
This commit is contained in:
@@ -43,7 +43,7 @@ th.c-story {width: 290px;}
|
||||
th.c-bug {width: 200px;}
|
||||
th.c-plan {width: 45px;}
|
||||
th.c-release {width: 50px;}
|
||||
th.c-actions {width: 60px;}
|
||||
th.c-actions {width: 50px;}
|
||||
[lang='en'] .en-wrap-text {white-space: normal; height: 24px; line-height: 1; font-size: 12px;}
|
||||
|
||||
|
||||
|
||||
@@ -2160,7 +2160,6 @@ class productModel extends model
|
||||
$menu .= $this->buildMenu('product', 'edit', $params, $product, $type);
|
||||
|
||||
if($type == 'view') $menu .= $this->buildMenu('product', 'delete', $params, $product, $type, 'trash', 'hiddenwin');
|
||||
if($type == 'browse' && common::hasPriv('product', 'updateOrder')) $menu .= "<i class='icon icon-move text-blue'></i>";
|
||||
|
||||
return $menu;
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
<?php if($canBatchEdit):?>
|
||||
<td class='c-checkbox'><?php echo html::checkbox('productIDList', array($product->id => ''));?></td>
|
||||
<?php endif;?>
|
||||
<td class="c-name text-left table-nest-title" title='<?php echo $product->name?>'>
|
||||
<td class="c-name text-left sort-handler table-nest-title" title='<?php echo $product->name?>'>
|
||||
<?php
|
||||
$productLink = html::a($this->createLink('product', 'browse', 'productID=' . $product->id), $product->name);
|
||||
echo "<span class='table-nest-icon icon icon-product'></span>" . $productLink;
|
||||
@@ -229,7 +229,7 @@
|
||||
<td><?php echo $product->plans;?></td>
|
||||
<td><?php echo $product->releases;?></td>
|
||||
<?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $product) . "</td>";?>
|
||||
<td class='c-actions sort-handler'><?php echo $this->product->buildOperateMenu($product, 'browse');?></td>
|
||||
<td class='c-actions'><?php echo $this->product->buildOperateMenu($product, 'browse');?></td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
<?php endif;?>
|
||||
|
||||
Reference in New Issue
Block a user