Merge branch 'revert-3e9bcdb8' into 'master'

Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"

See merge request easycorp/zentaopms!1328

module/common/model.php

@@ -528,7 +528,7 @@ class commonModel extends model
                         $attr         = "class='iframe' data-width='650px'";
                         break;
                     case 'project':
-                        if(!defined('TUTORIAL'))
+                        if(isset($config->maxVersion) and!defined('TUTORIAL'))
                         {
                             $params       = "programID=0&copyProjectID=0&extra=from=global";
                             $createMethod = 'createGuide';

module/project/lang/en.php

@@ -220,7 +220,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
-$lang->project->modelList['kanban']    = "Kanban";
 
 $lang->project->featureBar['all']       = 'All';
 $lang->project->featureBar['doing']     = 'Going';

module/project/lang/zh-cn.php

@@ -220,7 +220,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "瀑布";
-$lang->project->modelList['kanban']    = "看板";
 
 $lang->project->featureBar['all']       = '所有';
 $lang->project->featureBar['doing']     = '进行中';

module/project/model.php

@@ -632,7 +632,7 @@ class projectModel extends model
     /**
      * Get project pairs by model and project.
      *
-     * @param  string $model all|scrum|waterfall|kanban
+     * @param  string $model all|scrum|waterfall
      * @param  int    $programID
      * @access public
      * @return array