diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index a232cfa9c5..80db9c6e70 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -30,8 +30,10 @@ js::set('docID', $doc->id); ?>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index e7876bc02f..4aac6648b7 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -12,7 +12,7 @@ ?> -
+
>
diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 7affdbe9ed..9eac5b4856 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -23,3 +23,4 @@ ol, ul { padding-left: 20px; } #tabsNav .tab-pane>.main-table {border-radius: 0;} .body-modal #mainMenu>.btn-toolbar {width: auto;} +.body-modal #mainContent {min-height: 240px;} diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index bf24a625bf..d62b41de58 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -12,7 +12,7 @@ ?> -
+
>
diff --git a/module/release/css/view.css b/module/release/css/view.css index b503322793..a938e75ad5 100644 --- a/module/release/css/view.css +++ b/module/release/css/view.css @@ -8,3 +8,5 @@ #tabsNav .nav-tabs > li.pull-right {margin-right: 120px; margin-top: -5px} #tabsNav .nav-tabs > li.active + li.pull-right {margin-right: 0;} ol, ul { padding-left: 20px; } +.body-modal #mainMenu>.btn-toolbar {width: auto;} +.body-modal #mainContent {min-height: 240px;} diff --git a/module/search/model.php b/module/search/model.php index 0cf25f01c5..d4c366f677 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -524,11 +524,12 @@ class searchModel extends model if(is_numeric($word) and strlen($word) == 5) $condition = "OR title REGEXP '[^ ]{$likeWord}[^ ]' OR content REGEXP '[^ ]{$likeWord}[^ ]'"; $likeCondition .= $condition; } - + $words = str_replace('"', '', $against); $words = str_pad($words, 5, '_'); $allowedObject = array(); + if($type != 'all') { foreach($type as $module) $allowedObject[] = $module; @@ -540,7 +541,9 @@ class searchModel extends model $module = $objectType; if($module == 'case') $module = 'testcase'; if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType; - if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType; + if($module == 'caselib' and common::hasPriv('caselib', 'view')) $allowedObject[] = $objectType; + if($module == 'execution' and common::haspriv('project', 'view')) $allowedobject[] = $objectType; + if($module == 'project' and common::haspriv('program', 'index')) $allowedobject[] = $objectType; } } @@ -569,7 +572,7 @@ class searchModel extends model $method = 'viewstep'; } - if(strpos(',task,bug,case,build,release,testtask,testsuite,testreport,issue,risk,', ",$module,") !== false) + if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,issue,risk,', ",$module,") !== false) { if(!isset($this->config->objectTables[$record->objectType])) continue; $table = $this->config->objectTables[$record->objectType]; @@ -731,6 +734,8 @@ class searchModel extends model */ public function checkPriv($results, $pager = null) { + if($this->app->user->admin) return $results; + $this->loadModel('doc'); $products = $this->app->user->view->products; $programs = $this->app->user->view->programs; @@ -842,7 +847,6 @@ class searchModel extends model $noPrivNum++; } } - } elseif($objectType == 'todo') { diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 16f9a1f559..bcf6b53a8f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -399,7 +399,9 @@
@@ -419,6 +421,8 @@ story->unlink . $linkLang, '', "class='btn btn-info' id='unlinkStory'");?>
+ + type == 'story'):?>
+
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php index 4a0d1f842b..baa961f852 100644 --- a/module/testreport/view/view.html.php +++ b/module/testreport/view/view.html.php @@ -15,9 +15,11 @@