From 74688efe9b8d91b97a2dda71c5c8682610e16b47 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 23 Dec 2011 12:38:47 +0000
Subject: [PATCH]  * task#647, added commiter field to user table.

---
 db/update2.4.sql                    |  1 +
 module/my/view/editprofile.html.php | 10 +++++-----
 module/my/view/profile.html.php     |  4 ++++
 module/user/lang/en.php             |  1 +
 module/user/lang/zh-cn.php          |  1 +
 module/user/view/create.html.php    |  4 ++++
 module/user/view/edit.html.php      |  4 ++++
 module/user/view/profile.html.php   |  4 ++++
 module/user/view/view.html.php      |  4 ++++
 9 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/db/update2.4.sql b/db/update2.4.sql
index 4afb133fcf..7f57fd1fcc 100644
--- a/db/update2.4.sql
+++ b/db/update2.4.sql
@@ -1 +1,2 @@
 ALTER TABLE `zt_user` CHANGE `gendar` `gender` ENUM( 'f', 'm' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'f' ;
+ALTER TABLE `zt_user` ADD `commiter` VARCHAR( 100 ) NOT NULL AFTER `nickname` ;
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index 1b39043f17..5340d6104e 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -17,16 +17,16 @@
     <caption><?php echo $lang->my->editProfile;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->user->account;?></th>
-      <td><?php //echo html::input('account', $user->account, "readonly");
-                echo $user->account;
-                echo html::hidden('account',$user->account);
-          ?>
-      </td>
+      <td><?php echo $user->account . html::hidden('account',$user->account);?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->realname;?></th>
       <td><?php echo html::input('realname', $user->realname);?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+      <td><?php echo html::input('commiter', $user->commiter);?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->email;?></th>
       <td><?php echo html::input('email', $user->email);?></td>
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 466e5bcf8e..83f33adbdb 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -42,6 +42,10 @@
     <th class='rowhead'><?php echo $lang->user->realname;?></th>
     <td><?php echo $user->realname;?></td>
   </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+    <td><?php echo $user->commiter;?></td>
+  </tr>
   <!--
   <tr>
     <?php //echo $lang->user->nickname;?>
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index b03bb4df39..2213086ac6 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -60,6 +60,7 @@ $lang->user->password  = 'Password';
 $lang->user->password2 = 'Repeat password';
 $lang->user->realname  = 'Fullname';
 $lang->user->nickname  = 'Nickname';
+$lang->user->commiter  = 'Commit account';
 $lang->user->avatar    = 'Avatar';
 $lang->user->birthyear = 'Birth year';
 $lang->user->gender    = 'Gender';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index bb65282962..8927157cdd 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -60,6 +60,7 @@ $lang->user->password  = '密码';
 $lang->user->password2 = '请重复密码';
 $lang->user->realname  = '真实姓名';
 $lang->user->nickname  = '昵称';
+$lang->user->commiter  = '源代码提交帐号';
 $lang->user->avatar    = '头像';
 $lang->user->birthyear = '出生年';
 $lang->user->gender    = '性别';
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 0750b61184..e32eb2ad73 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -27,6 +27,10 @@
       <th class='rowhead'><?php echo $lang->user->realname;?></th>
       <td><?php echo html::input('realname', '', "class='text-3'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+      <td><?php echo html::input('commiter', '', "class='text-3'");?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->email;?></th>
       <td><?php echo html::input('email', '', "class='text-3'");?></td>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index f7de0f6ee9..6db56ec75e 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -27,6 +27,10 @@
       <th class='rowhead'><?php echo $lang->user->realname;?></th>
       <td><?php echo html::input('realname', $user->realname, "class='text-3'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+      <td><?php echo html::input('commiter', $user->commiter, "class='text-3'");?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->user->email;?></th>
       <td><?php echo html::input('email', $user->email, "class='text-3'");?></td>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index a5a530c896..64dd171932 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -41,6 +41,10 @@
     <th class='rowhead'><?php echo $lang->user->realname;?></th>
     <td><?php echo $user->realname;?></td>
   </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+    <td><?php echo $user->commiter;?></td>
+  </tr>
   <!--
   <tr>
     <?php // echo $lang->user->nickname;?>
diff --git a/module/user/view/view.html.php b/module/user/view/view.html.php
index 947163984b..a3f6be9da5 100644
--- a/module/user/view/view.html.php
+++ b/module/user/view/view.html.php
@@ -28,6 +28,10 @@
         <th class='rowhead'><?php echo $lang->user->nickname;?></th>
         <td><?php echo $user->nickname;?></td>
       </tr>
+      <tr>
+        <th class='rowhead'><?php echo $lang->user->commiter;?></th>
+        <td><?php echo $user->commiter;?></td>
+      </tr>
       <tr>
         <th class='rowhead'><?php echo $lang->user->join;?></th>
         <td><?php echo $user->join;?></td>