Merge branch 'sprint/224_tianshujie_bug' into 'master'

Sprint/224 tianshujie bug

See merge request easycorp/zentaopms!4890

module/block/model.php

@@ -486,7 +486,7 @@ class blockModel extends model
         $this->app->loadLang('project');
         $params = new stdclass();
         $params->type['name']    = $this->lang->block->type;
-        $params->type['options'] = $this->lang->project->featureBar;
+        $params->type['options'] = $this->lang->project->featureBar['browse'];
         $params->type['control'] = 'select';
 
         $params->orderBy['name']    = $this->lang->block->orderBy;

module/project/model.php

@@ -1093,7 +1093,7 @@ class projectModel extends model
             ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)
             ->remove('products,branch,plans,delta,newProduct,productName,future,contactListMenu,teamMembers')
             ->get();
-        if(!isset($this->config->setCode) or $this->config->setCode == 1) unset($project->code);
+        if(isset($this->config->setCode) and $this->config->setCode == 0) unset($project->code);
 
         $linkedProductsCount = 0;
         if(isset($_POST['products']))