diff --git a/module/bug/config.php b/module/bug/config.php index e812572d1e..eed62d49dd 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -72,3 +72,6 @@ $config->bug->list->allFields = 'id, module, project, story, task, lastEditedBy, lastEditedDate'; $config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution'; + +$config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools'); +$config->bug->editor->edit = array('id' => 'steps', 'tools' => 'bugTools'); diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 872defde3b..b40b2a3ef9 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -175,7 +175,6 @@ var userList = "".split(','); $(function() { $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); setAssignedTo(); - KE.show({id:'steps',items:bugTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')}); }) diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 33abcafd7b..08cc829245 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -29,46 +29,76 @@ oldTaskID = 'task;?>'; oldOpenedBuild = 'openedBuild;?>'; oldResolvedBuild = 'resolvedBuild;?>'; emptySelect = ""; -/* 当选择产品时,触发这个方法。*/ +/** + * Load all fields. + * + * @param int $productID + * @access public + * @return void + */ function loadAll(productID) { if(!changeProductConfirmed) { firstChoice = confirm('bug->confirmChangeProduct;?>'); - changeProductConfirmed = true; // 已经提示过,下次就不再提示了。 + changeProductConfirmed = true; // Only notice the user one time. } if(changeProductConfirmed || firstChoice) { $('#taskIdBox').get(0).innerHTML = emptySelect; - loadModuleMenu(productID); // 加载产品的模块列表。 - loadProductStories(productID); // 加载产品的需求列表。 - loadProductProjects(productID); // 加载项目列表。 - loadProductBuilds(productID); // 加载build列表。 + loadModuleMenu(productID); + loadProductStories(productID); + loadProductProjects(productID); + loadProductBuilds(productID); } } -/* 加载模块列表。*/ +/** + * Load module menu. + * + * @param int $productID + * @access public + * @return void + */ function loadModuleMenu(productID) { link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug'); $('#moduleIdBox').load(link); } -/* 加载产品的需求列表。*/ +/** + * Load product stories + * + * @param int $productID + * @access public + * @return void + */ function loadProductStories(productID) { link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&moduleId=0&storyID=' + oldStoryID); $('#storyIdBox').load(link); } -/* 加载项目列表。*/ +/** + * Load projects of product. + * + * @param int $productID + * @access public + * @return void + */ function loadProductProjects(productID) { link = createLink('product', 'ajaxGetProjects', 'productID=' + productID + '&projectID=' + oldProjectID); $('#projectIdBox').load(link); } -/* 加载产品build列表。*/ +/** + * loadProductBuilds + * + * @param productID $productID + * @access public + * @return void + */ function loadProductBuilds(productID) { link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild); @@ -77,7 +107,13 @@ function loadProductBuilds(productID) $('#resolvedBuildBox').load(link); } -/* 加载项目的任务列表和需求列表。*/ +/** + * loadProjectRelated + * + * @param projectID $projectID + * @access public + * @return void + */ function loadProjectRelated(projectID) { if(projectID) @@ -93,14 +129,26 @@ function loadProjectRelated(projectID) } } -/* 加载项目的任务列表。*/ +/** + * loadProjectTasks + * + * @param projectID $projectID + * @access public + * @return void + */ function loadProjectTasks(projectID) { link = createLink('task', 'ajaxGetProjectTasks', 'projectID=' + projectID + '&taskID=' + oldTaskID); $('#taskIdBox').load(link); } -/* 加载项目的需求列表。*/ +/** + * loadProjectStories + * + * @param projectID $projectID + * @access public + * @return void + */ function loadProjectStories(projectID) { productID = $('#product').get(0).value; @@ -108,7 +156,13 @@ function loadProjectStories(projectID) $('#storyIdBox').load(link); } -/* 加载项目的build列表。*/ +/** + * Load builds of a project. + * + * @param int $projectID + * @access public + * @return void + */ function loadProjectBuilds(projectID) { productID = $('#product').val(); @@ -118,7 +172,13 @@ function loadProjectBuilds(projectID) $('#resolvedBuildBox').load(link); } -/* 设置重复bug的显示。*/ +/** + * Set duplicate field. + * + * @param string $resolution + * @access public + * @return void + */ function setDuplicate(resolution) { if(resolution == 'duplicate') @@ -136,7 +196,6 @@ $(function() { $("#mailto").autocomplete(userList, { multiple: true, mustMatch: true}); $("#searchStories").colorbox({width:680, height:400, iframe:true, transition:'none'}); $("#searchTasks").colorbox({width:680, height:400, iframe:true, transition:'none'}); - KE.show({id:'steps', items:simpleTools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')}); }); diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php index 5a2dbc4077..31995fbe8f 100644 --- a/module/common/view/kindeditor.html.php +++ b/module/common/view/kindeditor.html.php @@ -1,6 +1,15 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> +moduleName; +$method = $this->methodName; +if(!isset($config->$module->editor->$method)) return; +$editor = $config->$module->editor->$method; +$editor['id'] = explode(',', $editor['id']); +?> diff --git a/module/doc/config.php b/module/doc/config.php index 4b1acd503b..bb335f11c6 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -3,3 +3,6 @@ $config->doc->createLib->requiredFields = 'name'; $config->doc->editLib->requiredFields = 'name'; $config->doc->create->requiredFields = 'title'; $config->doc->edit->requiredFields = 'title'; + +$config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools'); +$config->doc->editor->edit = array('id' => 'content', 'tools' => 'fullTools'); diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 0e992099ad..54b03231f5 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -37,7 +37,6 @@ function setType(type) $('#contentBox').hide(); } } -$(function() {KE.show({id:'content', items:tools, filterMode:true, imageUploadJson: createLink('file', 'ajaxUpload')});});