Merge branch 'sprint/178_hufangzhou_budget' into 'master'

* Fix bugs for compatible 8.0. See merge request easycorp/zentaopms!1170
easysoft · Dec 28, 2021 · dbe64a3 · dbe64a3
2 parents 8407a4a + 2f58499
commit dbe64a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/module/design/control.php b/module/design/control.php
@@ -78,7 +78,7 @@ public function browse($projectID = 0, $productID = 0, $type = 'all', $param = '
 
         /* Print top and right actions. */
         $this->lang->TRActions  = '<div class="btn-toolbar pull-right">';
-        if($this->config->maxVersion and common::hasPriv('design', 'submit'))
+        if(isset($this->config->maxVersion) and common::hasPriv('design', 'submit'))
         {
             $this->lang->TRActions .= '<div class="btn-group">';
             $this->lang->TRActions .= html::a($this->createLink('design', 'submit', "productID=$productID", '', true), "<i class='icon-plus'></i> {$this->lang->design->submit}", '', "class='btn btn-secondary iframe'");

diff --git a/module/program/model.php b/module/program/model.php
@@ -589,7 +589,7 @@ public function create()
             ->setDefault('openedDate', helper::now())
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
-            ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', round((float)$this->post->budget, 2))
             ->add('type', 'program')
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->create['id'], $this->config->allowedTags)

diff --git a/module/project/model.php b/module/project/model.php
@@ -763,7 +763,7 @@ public function create()
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
             ->setIF($this->post->delta == 999, 'days', 0)
             ->setIF($this->post->acl   == 'open', 'whitelist', '')
-            ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', round((float)$this->post->budget, 2))
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', helper::now())
             ->setDefault('team', substr($this->post->name, 0, 30))