Merge branch 'master_xieqiyu_25198' into 'master'

Master xieqiyu 25198

See merge request easycorp/zentaopms!4523

lib/front/front.class.php

@@ -38,6 +38,7 @@ class html extends baseHTML
         if(empty($target)) $target = '_self';
         if($target != '_self')  $misc .= " target='$target'";
         if($target == '_blank') $misc .= " rel='noopener noreferrer'";
+        if(strpos($misc, 'disabled')) $href = '#';
         return parent::a($href, $title, $misc, $newline);
     }
 

module/custom/view/browsestoryconcept.html.php

@@ -44,10 +44,9 @@
             <?php endif;?>
             <td class='text-left SRBox'><?php echo $URSR['SRName'];?></td>
             <td class='c-actions'>
-              <?php $disabled   = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
-              <?php $deleteLink = empty($disabled) ? $this->createLink('custom', 'deleteStoryConcept', "id=$key") : '#';?>
+              <?php $disabled = $key == $config->custom->URSR ? "disabled=disabled" : '';?>
               <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' data-width=" . ($this->config->URAndSR ? "480px" : "330px") . " title={$lang->edit}");?>
-              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($deleteLink, "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
+              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='admin'");?>
             </td>
           </tr>
         <?php endforeach;?>