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:
liugang
2018-07-04 16:18:51 +08:00
parent 327aeba49d 4a85831bea
commit 9510ebf17b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/view.css
+1
View File
@@ -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;}
module/company/lang/en.php
+2 -2
View File
@@ -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;
module/project/control.php
+1 -1
View File
@@ -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);
module/report/lang/en.php
+8 -8
View File
@@ -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;
module/story/model.php
+1
View File
@@ -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');