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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-01-25 10:50:40 +08:00
parent 0484785235 66ce378726
commit c13ea66635
7 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+4 -5
View File
@@ -615,11 +615,10 @@ class commonModel extends model
$subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
}
if($subMenu)
{
$label .= "<span class='caret'></span>";
$subMenu = "<ul class='dropdown-menu'>{$subMenu}</ul>";
}
if(empty($subMenu)) continue;
$label .= "<span class='caret'></span>";
$subMenu = "<ul class='dropdown-menu'>{$subMenu}</ul>";
}
$menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";
module/group/css/browse.css
+2
View File
@@ -1 +1,3 @@
.user {display:block; width:80px; float:left; overflow:hidden}
#groupList tbody tr.even td{word-wrap:break-word;}
module/project/view/kanban.html.php
+1 -1
View File
@@ -159,7 +159,7 @@ $account = $this->app->user->account;
<div class='info'>
<?php
$assignedToRealName = "<span>" . zget($realnames, $bug->assignedTo) . "</span>";
if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary text'>{$lang->task->noAssigned}</span>";
if(empty($bug->assignedTo)) $assignedToRealName = "<span class='text-primary text'>{$lang->task->noAssigned}</span>";
echo html::a($this->createLink('bug', 'assignTo', "bugID={$bug->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe bug-assignedTo"');?>
<span class='status-bug status-<?php echo $bug->status;?>' title='<?php echo $lang->bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span>
</div>
module/testcase/view/create.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
<span class='input-group-btn' style='width: 0.01%'>
<?php if($storyID == 0): ?>
<a href='' id='preview' class='btn iframe hidden'><?php echo $lang->preview;?></a>
<a href='' id='preview' class='btn hidden'><?php echo $lang->preview;?></a>
<?php else:?>
<?php echo html::a($this->createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn' id='preview'");?>
<?php endif;?>
module/testtask/control.php
+1 -1
View File
@@ -831,7 +831,7 @@ class testtask extends control
$caseResult = $this->testtask->createResult($runID);
if(dao::isError()) die(js::error(dao::getError()));
if('fail' == $caseResult) {
if($caseResult == 'fail') {
$response['result'] = 'success';
$response['locate'] = $this->createLink('testtask', 'results',"runID=$runID&caseID=$caseID&version=$version");
module/testtask/js/runcase.js
+37 -31
View File
@@ -52,46 +52,52 @@ function loadFilesName()
$(document).ready(function()
{
// First unbind ajaxForm for form.
$("form[data-type='ajax']").unbind('submit');
$("#dataform").unbind('submit');
// Bind ajaxForm for form again.
$.ajaxForm("form[data-type='ajax']", function(response)
{
if(response.locate)
$('#dataform').ajaxForm(
{
finish:function(response)
{
if(response.locate == 'reload' && response.target == 'parent')
if(response.locate)
{
parent.$.cookie('selfClose', 1);
parent.$.closeModal(null, 'this');
} else if(response.next) {
location.href = response.locate;
} else {
// Get cases result
$('#resultsContainer').load(response.locate + " #casesResults", function()
if(response.locate == 'reload' && response.target == 'parent')
{
$('tr:first').addClass("show-detail");
$('#tr-detail_1').removeClass("hide");
$('.result-item').click(function()
parent.$.cookie('selfClose', 1);
parent.$.closeModal(null, 'this');
}
else if(response.next)
{
location.href = response.locate;
}
else
{
// Get cases result
$('#resultsContainer').load(response.locate + " #casesResults", function()
{
var $this = $(this);
$this.toggleClass('show-detail');
var show = $this.hasClass('show-detail');
$this.next('.result-detail').toggleClass('hide', !show);
$this.find('.collapse-handle').toggleClass('icon-chevron-down', !show).toggleClass('icon-chevron-up', show);
$('tr:first').addClass("show-detail");
$('#tr-detail_1').removeClass("hide");
$('.result-item').click(function()
{
var $this = $(this);
$this.toggleClass('show-detail');
var show = $this.hasClass('show-detail');
$this.next('.result-detail').toggleClass('hide', !show);
$this.find('.collapse-handle').toggleClass('icon-chevron-down', !show).toggleClass('icon-chevron-up', show);
});
$('#casesResults table caption .result-tip').html($('#resultTip').html());
$("#submit").text(caseResultSave);
$("#submit").attr({"disabled":"disabled"});
});
}
}
$('#casesResults table caption .result-tip').html($('#resultTip').html());
$("#submit").text(caseResultSave);
$("#submit").attr({"disabled":"disabled"});
});
}
return false;
}
return false;
});
});
$(document).on('click', ".step-group input[type='checkbox']", function()
{
module/todo/view/view.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-close'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
if(common::hasPriv('action', 'comment', $todo)) echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
if($this->session->todoList)
{