deleted):?> execution->deleted;?> diff --git a/module/extension/model.php b/module/extension/model.php index d1389dddec..29de175bba 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -617,7 +617,7 @@ class extensionModel extends model foreach($dirs as $dir) { if(!is_dir($appRoot . $dir)) continue; - if(!rmdir($appRoot . $dir)) $removeCommands[] = "rmdir $appRoot$dir"; // fix bug #2965 + if(!rmdir($appRoot . $dir)) $removeCommands[] = PHP_OS == 'Linux' ? "rm -fr $appRoot$dir" : "rmdir $appRoot$dir /s /q"; } } diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 39ea964236..6fc067639f 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -45,8 +45,8 @@ role == 'projectAdmin';?> group->managepriv = $lang->group->managePrivByGroup;?> - id", $group, 'list', 'eye', '', "$disabled");?> - id", $group, 'list', 'lock');?> + id", $group, 'list', 'eye', '', $disabled);?> + id", $group, 'list', 'lock', '', $disabled);?> group->managemember = $lang->group->manageMember;?> id", $group, 'list', 'persons');?> diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 8a8496bca6..52ff8d0e5b 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -23,6 +23,7 @@ .region .kanban-header-sub-cols {margin-left:0;} .region .kanban-header-sub-cols .kanban-header-col > .title {max-width: 100% !important;min-width:240px;} .region .sort .region-header {cursor: move;} +.region .kanban.kanban-dragging {overflow: hidden;} .region .kanban {padding: 0px 5px 10px 10px; min-height: unset; overflow:auto; width: 100%} .region .kanban .form-actions {margin: 0;} diff --git a/module/project/js/view.js b/module/project/js/view.js new file mode 100644 index 0000000000..92fe169bf3 --- /dev/null +++ b/module/project/js/view.js @@ -0,0 +1,35 @@ +(function() +{ + /* Expand or collapse text */ + function limitText() + { + var fullText; + var limitText; + var $text = $(this); + var options = $.extend({limitSize: 40, suffix: '…'}, $text.data()); + var text = $text.text(); + if(text.length > options.limitSize) + { + fullText = $text.html(); + limitText = text.substring(0, options.limitSize) + options.suffix; + $text.text(limitText).addClass('limit-text-on'); + + var $toggleBtn = options.toggleBtn ? $(options.toggleBtn) : $text.next('.text-limit-toggle'); + $toggleBtn.text($toggleBtn.data('textExpand')); + $toggleBtn.on('click', function() + { + var isLimitOn = $text.toggleClass('limit-text-on').hasClass('limit-text-on'); + if(isLimitOn) $text.text(limitText); + else $text.html(fullText); + $toggleBtn.text($toggleBtn.data(isLimitOn ? 'textExpand' : 'textCollapse')); + }); + } + else + { + (options.toggleBtn ? $(options.toggleBtn) : $text.next('.text-limit-toggle')).hide(); + } + $text.removeClass('hidden'); + }; + $.fn.textLimit = function(){return this.each(limitText);}; + $(function(){$('.text-limit').textLimit();}); +})(); diff --git a/module/project/model.php b/module/project/model.php index 8b5db8db7e..0ae9c93ae7 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -678,12 +678,14 @@ class projectModel extends model /** * Get project pairs by model and project. * - * @param string $model all|scrum|waterfall|kanban - * @param int $programID + * @param string $model all|scrum|waterfall|kanban + * @param int $programID + * @param string $param noclosed + * @param string|int|array $append * @access public * @return array */ - public function getPairsByModel($model = 'all', $programID = 0, $param = '') + public function getPairsByModel($model = 'all', $programID = 0, $param = '', $append = '') { if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs(); @@ -696,6 +698,7 @@ class projectModel extends model ->beginIF($model != 'all')->andWhere('model')->eq($model)->fi() ->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() + ->beginIF(!empty($append))->orWhere('id')->in($append)->fi() ->orderBy('id_desc') ->fetchAll(); @@ -906,8 +909,8 @@ class projectModel extends model $this->dao->insert(TABLE_PROJECT)->data($project) ->autoCheck() ->batchcheck($requiredFields, 'notempty') - ->checkIF(!empty($project->name), 'name', 'unique', "`type`='project' and `parent` = $project->parent") - ->checkIF(!empty($project->code), 'code', 'unique', "`type`='project'") + ->checkIF(!empty($project->name), 'name', 'unique', "`type`='project' and `parent` = $project->parent and `model` = '{$project->model}'") + ->checkIF(!empty($project->code), 'code', 'unique', "`type`='project' and `model` = '{$project->model}'") ->checkIF($project->end != '', 'end', 'gt', $project->begin) ->exec(); @@ -1139,8 +1142,8 @@ class projectModel extends model ->checkIF($project->begin != '', 'begin', 'date') ->checkIF($project->end != '', 'end', 'date') ->checkIF($project->end != '', 'end', 'gt', $project->begin) - ->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type` = 'project' and `parent` = $project->parent") - ->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type` = 'project'") + ->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type` = 'project' and `parent` = $project->parent and `model` = '{$project->model}'") + ->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type` = 'project' and `model` = '{$project->model}'") ->where('id')->eq($projectID) ->exec(); @@ -1280,8 +1283,8 @@ class projectModel extends model ->checkIF($project->begin != '', 'begin', 'date') ->checkIF($project->end != '', 'end', 'date') ->checkIF($project->end != '', 'end', 'gt', $project->begin) - ->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type`='project' and `parent` = $parentID") - ->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type`='project'") + ->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type`='project' and `parent` = $parentID and `model` = '{$project->model}'") + ->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type`='project' and `model` = '{$project->model}'") ->where('id')->eq($projectID) ->exec(); diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 085887fa70..562956096c 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -125,7 +125,7 @@
id;?> code;?> name;?>
deleted):?> project->deleted;?> diff --git a/module/repo/model.php b/module/repo/model.php index bb0b28c688..2a54926e2e 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -200,6 +200,12 @@ class repoModel extends model if(!$this->checkClient()) return false; if(!$this->checkConnection()) return false; + if($this->post->SCM == 'Gitlab') + { + if($this->post->gitlabHost == '') dao::$errors['gitlabHost'] = sprintf($this->lang->error->notempty, $this->lang->repo->gitlabHost); + if($this->post->gitlabProject == '') dao::$errors['gitlabProject'] = sprintf($this->lang->error->notempty, $this->lang->repo->gitlabProject); + } + $data = fixer::input('post') ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken) ->setIf($this->post->SCM == 'Gitlab', 'path', $this->post->gitlabProject) @@ -262,6 +268,12 @@ class repoModel extends model { $repo = $this->getRepoByID($id); + if($this->post->SCM == 'Gitlab') + { + if($this->post->gitlabHost == '') dao::$errors['gitlabHost'] = sprintf($this->lang->error->notempty, $this->lang->repo->gitlabHost); + if($this->post->gitlabProject == '') dao::$errors['gitlabProject'] = sprintf($this->lang->error->notempty, $this->lang->repo->gitlabProject); + } + $data = fixer::input('post') ->setIf($this->post->SCM == 'Gitlab', 'password', $this->post->gitlabToken) ->setIf($this->post->SCM == 'Gitlab', 'path', $this->post->gitlabProject) @@ -1149,7 +1161,12 @@ class repoModel extends model { if($this->post->SCM == 'Gitlab') return true; if(!$this->config->features->checkClient) return true; - if(!$this->post->client) return true; + + if(!$this->post->client) + { + dao::$errors['client'] = sprintf($this->lang->error->notempty, $this->lang->repo->client); + return false; + } if(strpos($this->post->client, ' ')) { diff --git a/module/search/model.php b/module/search/model.php index 09aff5165d..770c90cc3f 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -399,7 +399,6 @@ class searchModel extends model public function deleteQuery($queryID) { $this->dao->delete()->from(TABLE_USERQUERY)->where('id')->eq($queryID)->andWhere('account')->eq($this->app->user->account)->exec(); - echo 'success'; } /** diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index 4b1efa682f..7af76e8e24 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -546,6 +546,7 @@ $(function() if($('#formType').val() == 'more') expandForm(true); $searchForm.on('click', '.user-query .icon-close', function(e) { + e.preventDefault(); // Fix bug #21572. var $query = $(this).closest('.user-query'); var queryId = $query.data('queryId'); var deleteQueryLink = $.createLink('search', 'deleteQuery', 'queryID=' + queryId); diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 9d43318036..f0c8895767 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -305,7 +305,7 @@ ?>
|
不能创建临时目录，请确认目录%s是否存在并有操作权限。
- 命令为：chmod o=rwx -R %s。
+ 命令为：chmod 777 -R %s。
Can't create tmp directory, make sure the directory %s exists and has permission to operate.
- Commond: chmod o=rwx -R %s.
+ Commond: chmod 777 -R %s.
|