* Fix bug #5248, #5260, #5263, #5266.

flpgit · Jan 25, 2019 · 66ce378 · 66ce378
1 parent 4842c96
commit 66ce378
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 35 deletions.
diff --git a/module/group/css/browse.css b/module/group/css/browse.css
@@ -1 +1,3 @@
 .user {display:block; width:80px; float:left; overflow:hidden}
+
+#groupList tbody tr.even td{word-wrap:break-word;}
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
@@ -159,7 +159,7 @@
                   <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>

diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
@@ -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;?>

diff --git a/module/testtask/control.php b/module/testtask/control.php
@@ -831,7 +831,7 @@ public function runCase($runID, $caseID = 0, $version = 0)
             $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");

diff --git a/module/testtask/js/runcase.js b/module/testtask/js/runcase.js
@@ -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");
 
-                    $('#casesResults table caption .result-tip').html($('#resultTip').html());
+                        $('.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);
+                        });
 
-                    $("#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()
     {

diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
@@ -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)
         {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		.user {display:block; width:80px; float:left; overflow:hidden}

		#groupList tbody tr.even td{word-wrap:break-word;}