diff --git a/module/backup/control.php b/module/backup/control.php index 4526eda977..a6460f7caa 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -177,7 +177,6 @@ class backup extends control if($reload == 'yes') { - echo js::alert($this->lang->backup->success->backup); die(js::reload('parent')); } else diff --git a/module/backup/js/index.js b/module/backup/js/index.js index 941ea35e19..4fc094c196 100644 --- a/module/backup/js/index.js +++ b/module/backup/js/index.js @@ -15,6 +15,7 @@ $(function() $('.rmPHPHeader').click(function() { $('#waitting .modal-body #backupType').html(rmPHPHeader); + $('#waitting .modal-content #message').hide(); $('#waitting').modal('show'); }) @@ -26,6 +27,7 @@ $(function() if(result) { $('#waitting .modal-body #backupType').html(restore); + $('#waitting .modal-content #message').hide(); $('#waitting').modal('show'); $.getJSON(url, function(response) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 24f7853247..d61bfcb34a 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -122,19 +122,19 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
-
- " . $lang->bug->batchCreate, '', "class='btn btn-secondary'"); if(commonModel::isTutorialMode()) diff --git a/module/build/control.php b/module/build/control.php index 28a90984dc..eb7dd0d8b6 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -25,7 +25,7 @@ class build extends control $buildID = $this->build->create($projectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action')->create('build', $buildID, 'opened'); - if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'loadBuildsFormParentPage'));//Code for task #5126. + if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($projectID)"));//Code for task #5126. $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID"))); } diff --git a/module/build/js/common.js b/module/build/js/common.js index b8475017da..6e672a87da 100644 --- a/module/build/js/common.js +++ b/module/build/js/common.js @@ -18,5 +18,3 @@ function loadBranches(productID) } }); } - -window.loadBuildsFormParentPage = function(){window.parent.loadProjectBuilds(0);}; //Code for task #5126. diff --git a/module/group/model.php b/module/group/model.php index a55babf18f..f51cdb441e 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -306,9 +306,10 @@ class groupModel extends model */ public function updateUser($groupID) { + $members = $this->post->members ? $this->post->members : array(); $groupUsers = $this->dao->select('account')->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->fetchPairs('account'); - $newUsers = array_diff($this->post->members, $groupUsers); - $delUsers = array_diff($groupUsers, $this->post->members); + $newUsers = array_diff($members, $groupUsers); + $delUsers = array_diff($groupUsers, $members); $this->dao->delete()->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->andWhere('account')->in($delUsers)->exec(); diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index e6ca9c9a70..1c964a04da 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -96,9 +96,10 @@
diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index edfc610213..43a932ab75 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -21,3 +21,4 @@ #unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;} .fixed-footer .text{color:#fff} ol, ul { padding-left: 20px; } +#tabsNav .tab-pane>.main-table{border-radius: 0;} diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index 453c19152e..c5af58f1f6 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -46,9 +46,10 @@ @@ -56,13 +57,15 @@ diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index 8a530afb40..30ee650cce 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -26,11 +26,11 @@ createLink('project', 'importTask', "project=$project->id") : '#'; - echo "
  • " . html::a($link, $lang->project->importTask, '', $misc) . "
  • "; + echo "
  • " . html::a($link, $lang->project->importTask, '', $misc) . "
  • "; $misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled"; $link = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#'; - echo "
  • " . html::a($link, $lang->project->importBug, '', $misc) . "
  • "; + echo "
  • " . html::a($link, $lang->project->importBug, '', $misc) . "
  • "; ?> diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 4bddf5e2d7..9944a59f05 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -122,9 +122,10 @@ js::set('browseType', $browseType); @@ -133,13 +134,15 @@ js::set('browseType', $browseType); diff --git a/module/project/view/tree.html.php b/module/project/view/tree.html.php index 1b5a6f1a71..c80a212363 100644 --- a/module/project/view/tree.html.php +++ b/module/project/view/tree.html.php @@ -38,11 +38,11 @@ createLink('project', 'importTask', "project=$project->id") : '#'; - echo "
  • " . html::a($link, $lang->project->importTask, '', $misc) . "
  • "; + echo "
  • " . html::a($link, $lang->project->importTask, '', $misc) . "
  • "; $misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled"; $link = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#'; - echo "
  • " . html::a($link, $lang->project->importBug, '', $misc) . "
  • "; + echo "
  • " . html::a($link, $lang->project->importBug, '', $misc) . "
  • "; ?> diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 6a24c0ac48..5e7d41e261 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -124,13 +124,15 @@ @@ -138,13 +140,15 @@ diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js index 4d9fb925d4..ae1a8ceb76 100755 --- a/module/testtask/js/create.js +++ b/module/testtask/js/create.js @@ -19,8 +19,6 @@ function loadProjectRelated(projectID) */ function loadProjectBuilds(projectID) { - if(!projectID) projectID = $('#project').val(); - selectedBuild = $('#build').val(); if(!selectedBuild) selectedBuild = 0; link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);