Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

db/update15.4.sql

@@ -23,4 +23,3 @@ CREATE TABLE `zt_mr` (
   `mergeStatus` char(30) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-

module/project/js/managemembers.js

@@ -4,7 +4,7 @@
  * @access public
  * @return void
  */
-function saveMemebers()
+function saveMembers()
 {
     var isDeleted   = false;
     var accountList = [];

module/project/model.php

@@ -1658,7 +1658,7 @@ class projectModel extends model
 
         $type    = $this->config->systemMode == 'new' ? $project->type : 'project';
 
-        $members =  $this->dao->select("t1.account, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1')
+        $members = $this->dao->select("t1.account, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
             ->where('t1.root')->eq((int)$projectID)
             ->andWhere('t1.type')->eq($type)

module/project/view/managemembers.html.php

@@ -116,7 +116,7 @@
               else
               {
                   echo html::submitButton('', '', 'hidden btn btn-wide btn-primary');
-                  echo html::commonButton($lang->save, 'onclick="saveMemebers()" id="saveBtn"', 'btn btn-wide btn-primary');
+                  echo html::commonButton($lang->save, 'onclick="saveMembers()" id="saveBtn"', 'btn btn-wide btn-primary');
               }
               echo html::backButton();
             ?>