Merge branch 'master' into zentaopms_workflow

2019-07-24 09:14:23 +08:00
parent 6ef88595e1 65ca28c111
commit f858660ceb
383 changed files with 12033 additions and 2094 deletions
@@ -27,7 +27,7 @@
    <form method='post' target='hiddenwin'>
      <table class='table table-form'>
        <tr>
-          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
+          <?php $colWidth = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
          <th class='<?php echo $colWidth;?>'><?php echo $lang->task->assignedTo;?></th>
          <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
          <td></td>