diff --git a/module/bug/css/view.css b/module/bug/css/view.css index 7908c48a09..3e5652d2ac 100644 --- a/module/bug/css/view.css +++ b/module/bug/css/view.css @@ -1,2 +1,3 @@ .content .stepTitle{display:block; color: green; margin:0px;} .table-fixed td{white-space: unset} +.table-data tr > td{word-break: break-all; word-wrap: break-word;} diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 06eb84d09a..35bd18740d 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -12,7 +12,7 @@ $lang->company->common = 'Company'; $lang->company->index = "Home"; $lang->company->edit = "Edit Company"; -$lang->company->view = "Company Info"; +$lang->company->view = "Company Information"; $lang->company->browse = "User List"; $lang->company->dynamic = "Dynamic"; $lang->company->orgView = 'View'; @@ -24,7 +24,7 @@ $lang->company->address = 'Mailing Address'; $lang->company->zipcode = 'Zip Code'; $lang->company->website = 'Website'; $lang->company->backyard = 'Intranet'; -$lang->company->guest = 'Anonymous Login'; +$lang->company->guest = 'Guest Login'; $lang->company->admins = 'Administrators'; $lang->company->product = $lang->productCommon; diff --git a/module/project/control.php b/module/project/control.php index aef67193b3..28e3bfb457 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2299,7 +2299,7 @@ class project extends control public function importPlanStories($projectID, $planID) { $planStories = $planProducts = array(); - $planStory = $this->loadModel('story')->getPlanStories($planID); + $planStory = $this->loadModel('story')->getPlanStories($planID, 'changed,active,reviewing'); if(!empty($planStory)) { $planStories = array_keys($planStory); diff --git a/module/report/lang/en.php b/module/report/lang/en.php index a5ced624c4..efd8cf87a5 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -38,11 +38,11 @@ $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; $lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bug Submission Report'; -$lang->report->bugAssign = 'Bug Assignment Report'; -$lang->report->workload = 'Workload'; -$lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Created From'; +$lang->report->bugCreate = 'Bug Reported Statement'; +$lang->report->bugAssign = 'Bug Assigned Statement'; +$lang->report->workload = 'Team Workload Statement'; +$lang->report->workloadAB = 'Workload Statement'; +$lang->report->bugOpenedDate = 'Bug reported from'; $lang->report->taskAssignedDate = 'From'; $lang->report->beginAndEnd = ' From'; $lang->report->dept = 'Dept'; @@ -50,9 +50,9 @@ $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; $lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation'; $lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bugs Reported|report|bugcreate'; -$lang->reportList->test->lists[13] = 'Bugs Assigned|report|bugassign'; -$lang->reportList->staff->lists[10] = 'Workload|report|workload'; +$lang->reportList->test->lists[10] = 'Bugs Reported Statement|report|bugcreate'; +$lang->reportList->test->lists[13] = 'Bugs Assigned Statement|report|bugassign'; +$lang->reportList->staff->lists[10] = 'Team Workload Statement|report|workload'; $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; diff --git a/module/story/model.php b/module/story/model.php index dcee73ecde..e6c801684f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1685,6 +1685,7 @@ class storyModel extends model ->leftJoin(TABLE_PRODUCT)->alias('t4')->on('t2.product = t4.id') ->where($storyQuery) ->andWhere('t1.project')->eq((int)$projectID) + ->andWhere('t2.deleted')->eq(0) ->orderBy($orderBy) ->page($pager, 't2.id') ->fetchAll('id');