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

module/api/js/common.js

@@ -200,6 +200,14 @@ try {
                     }
                 }
             },
+            current:
+            {
+                type: Array
+            },
+            ckey:
+            {
+                type: Number
+            }
         },
         watch: {
             value: {
@@ -209,6 +217,14 @@ try {
                 deep: true,
             }
         },
+        computed:
+        {
+            typeOptionsFilter: function()
+            {
+                if(this.current[this.ckey + 1] && this.current[this.ckey + 1].parentKey && this.current[this.ckey + 1].parentKey == this.current[this.ckey].key) return typeOptions.slice(0, 2);
+                return typeOptions;
+            }
+        },
         methods: {
             add() {
                 this.$emit('add', this.value)
@@ -229,7 +245,7 @@ try {
           </td>
           <td class="w-100px">
               <select class="form-control" v-model="value.paramsType">
-                <option v-for="item in typeOptions" :value="item.value">{{item.label}}</option>
+                <option v-for="item in typeOptionsFilter" :value="item.value">{{item.label}}</option>
               </select>
           </td>
           <td class="w-80px">
@@ -435,7 +451,7 @@ try {
                   </thead>
                   <tbody>
                     <template v-for="(item,key) in current">
-                      <param-field :value.sync="item" @add="add(current, $event)" @del="del(current, key)"  @sub="addSub(current, key, $event)"></param-field>
+                      <param-field :current="current" :ckey="key" :value.sync="item" @add="add(current, $event)" @del="del(current, key)"  @sub="addSub(current, key, $event)"></param-field>
                     </template>
                   </tbody>
               </table>

module/api/view/index.html.php

@@ -31,7 +31,7 @@
             echo "<div class='menu-actions'>";
             echo html::a('javascript:;', "<i class='icon icon-ellipsis-v'></i>", '', "data-toggle='dropdown' class='btn btn-link'");
             echo "<ul class='dropdown-menu pull-right'>";
-            if($canTreeBrowse) echo '<li>' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->manageType, '', "class='iframe'") . '</li>';
+            if($canTreeBrowse) echo '<li>' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->manageType, '', "class='iframe' data-width='1200px'") . '</li>';
             if($canViewReleases) echo '<li>' . html::a($this->createLink('api', 'releases', "libID=$libID", '', true), '<i class="icon-version"></i> ' . $this->lang->api->managePublish, '', "class='iframe'") . '</li>';
             echo "<li class='divider'></li>";
             if($canEditLib) echo '<li>' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->api->editLib, '', "class='iframe'") . '</li>';

module/personnel/view/invest.html.php

@@ -22,7 +22,7 @@
         <thead>
           <tr>
             <th rowspan='2' class="c-user"> <?php echo $lang->personnel->name;?></th>
-            <th rowspan='2'><?php echo $lang->personnel->role;?></th>
+            <th rowspan='2' class="c-role"><?php echo $lang->personnel->role;?></th>
             <th rowspan='2'><?php echo $lang->personnel->projects;?></th>
             <th rowspan='2'><?php echo $lang->personnel->executions;?></th>
             <th colspan="2"><?php echo $lang->personnel->workingHours;?></th>
@@ -61,7 +61,7 @@
           <?php foreach($investList as $personnel):?>
           <tr>
             <td title='<?php echo $personnel['realname'];?>'><?php echo $personnel['realname'];?></td>
-            <td title='<?php echo $personnel['role'];?>'><?php echo $personnel['role'];?></td>
+            <td title='<?php echo $personnel['role'];?>' style="overflow: hidden; white-space:nowrap; text-overflow: ellipsis;"><?php echo $personnel['role'];?></td>
             <td><?php echo $personnel['projects'];?></td>
             <td><?php echo $personnel['executions'];?></td>
             <td><?php echo round($personnel['consumedTask'], 1);?></td>

module/story/model.php

@@ -253,7 +253,8 @@ class storyModel extends model
         {
             $storyID = $this->dao->lastInsertID();
 
-            if($story->parent)
+            /* Fix bug #21992, user story have no parent story. */
+            if(isset($story->parent) and $story->parent)
             {
                 $stories = array($storyID);
                 $this->subdivide($story->parent, $stories);

module/user/lang/en.php

@@ -251,6 +251,9 @@ $lang->user->contacts->common   = 'Contacts';
 $lang->user->contacts->listName = 'List Name';
 $lang->user->contacts->userList = 'User List';
 
+$lang->usercontact = new stdclass;
+$lang->usercontact->listName = 'List Name';
+
 $lang->user->contacts->manage        = 'Manage List';
 $lang->user->contacts->contactsList  = 'Contact List';
 $lang->user->contacts->selectedUsers = 'Users';

module/user/lang/zh-cn.php

@@ -251,6 +251,9 @@ $lang->user->contacts->common   = '联系人';
 $lang->user->contacts->listName = '列表名称';
 $lang->user->contacts->userList = '用户列表';
 
+$lang->usercontact = new stdclass;
+$lang->usercontact->listName = '列表名称';
+
 $lang->user->contacts->manage        = '维护列表';
 $lang->user->contacts->contactsList  = '已有列表';
 $lang->user->contacts->selectedUsers = '选择用户';