Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #2689.

Browse Source
This commit is contained in:
wangyidong
2016-11-30 17:13:40 +08:00
parent 964ebebc54
commit feb0e70608
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+5 -5
View File
@@ -65,11 +65,11 @@ class router extends baseRouter
*/
public function saveError($level, $message, $file, $line)
{
$errorNO[E_ERROR] = E_ERROR;
$errorNO[E_PARSE] = E_PARSE;
$errorNO[E_CORE_ERROR] = E_CORE_ERROR;
$errorNO[E_USER_ERROR] = E_USER_ERROR;
if(isset($errorNO[$level]) and $this->config->debug == false) $this->config->debug = true;
$fatalLevel[E_ERROR] = E_ERROR;
$fatalLevel[E_PARSE] = E_PARSE;
$fatalLevel[E_CORE_ERROR] = E_CORE_ERROR;
$fatalLevel[E_USER_ERROR] = E_USER_ERROR;
if(isset($fatalLevel[$level])) $this->config->debug = true;
parent::saveError($level, $message, $file, $line);
}
}
module/common/view/kindeditor.html.php
+5 -1
View File
@@ -91,7 +91,11 @@ function initKindeditor(afterInit)
})
}, 10);
}
if(pasted && placeholderText == '') placeholderText = ' <?php echo $this->lang->noticePasteImg?>';
if(pasted)
{
if(placeholderText) placeholderText += '<br />';
placeholderText += ' <?php echo $this->lang->noticePasteImg?>';
}
/* Paste in chrome.*/
/* Code reference from http://www.foliotek.com/devblog/copy-images-from-clipboard-in-javascript/. */
module/productplan/view/view.html.php
+1 -1
View File
@@ -208,7 +208,7 @@
foreach($modules as $moduleId => $module)
{
$actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId");
echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin', this)\"") . "</li>";
echo "<li class='option' data-key='$moduleId'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin', this)\"") . "</li>";
}
echo '</ul>';
if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";