Merge branch '15.4'

module/project/control.php

@@ -400,6 +400,7 @@ class project extends control
         }
 
         if($this->app->tab == 'program') $this->loadModel('program')->setMenu($programID);
+        $this->session->set('projectModel', $model);
 
         $name      = '';
         $code      = '';

module/project/view/browsebycard.html.php

@@ -113,7 +113,7 @@
         <div class='panel-body'>
           <div class='project-infos'>
             <?php
-            $projectBudget = in_array($app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $lang->project->tenThousand : round((float)$project->budget, 2);
+            $projectBudget = in_array($app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $lang->project->tenThousand : round((float)$project->budget, 2);
             $budgetTitle   = $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->budget . $lang->project->future;
             $project->end  = $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;
             $project->date = str_replace('-', '.', $project->begin) . ' - ' . str_replace('-', '.', $project->end);

module/project/view/managemembers.html.php

@@ -13,7 +13,7 @@
     <div class='input-group space w-200px'>
       <span class='input-group-addon'><?php echo $lang->execution->selectDept?></span>
       <?php echo html::select('dept', $depts, $dept, "class='form-control chosen' onchange='setDeptUsers(this)' data-placeholder='{$lang->execution->selectDeptTitle}'");?>
-      <?php if(!empty(array_filter($teams2Import))):?>
+      <?php if(count($teams2Import) > 1):?>
       <span class='input-group-addon'><?php echo $lang->execution->copyTeam;?></span>
       <?php echo html::select('project', $teams2Import, $copyProjectID, "class='form-control chosen' onchange='choseTeam2Copy(this)' data-placeholder='{$lang->project->copyTeamTitle}'");?>
       <?php endif;?>