Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'

Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265

module/execution/js/managemembers.js

@@ -23,7 +23,7 @@ function setRole(account, roleID)
 
 function addItem(obj)
 {
-    var item = $('#addItem').html().replace(/%i%/g, i);
+    var item = $('#addItem').html().replace(/%i%/g, itemIndex);
     $(obj).closest('tr').after('<tr class="addedItem">' + item  + '</tr>');
     var $accounts = $('#hours' + i).closest('tr').find('select:first')
 
@@ -37,7 +37,7 @@ function addItem(obj)
         var pickerremote = $accounts.attr('data-pickerremote');
         $accounts.picker({chosenMode: true, remote: pickerremote});
     }
-    i ++;
+    itemIndex ++;
 }
 
 function deleteItem(obj)

module/execution/view/managemembers.html.php

@@ -122,7 +122,7 @@
       </tbody>
       <tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td></tr></tfoot>
     </table>
-    <?php js::set('i', $i);?>
+    <?php js::set('itemIndex', $i);?>
   </form>
 </div>
 <div>

module/project/js/managemembers.js

@@ -62,12 +62,12 @@ function setRole(account, roleID)
  */
 function addItem(obj)
 {
-    var item = $('#addItem').html().replace(/%i%/g, i);
+    var item = $('#addItem').html().replace(/%i%/g, itemIndex);
     var $tr  = $('<tr class="addedItem">' + item  + '</tr>').insertAfter($(obj).closest('tr'));
     $tr.find('select:first')
         .trigger('liszt:updated')
         .picker({type: 'user'});
-    i++;
+    itemIndex++;
 }
 
 /**

module/project/view/managemembers.html.php

@@ -125,7 +125,7 @@
         </tr>
       </tfoot>
     </table>
-    <?php js::set('i', $i);?>
+    <?php js::set('itemIndex', $i);?>
   </form>
 </div>
 <div>