Merge branch 'liyuchun_bug_20430' into 'master'

Fix bug #19644,19662,19680,20430.

See merge request easycorp/zentaopms!2466

config/zentaopms.php

@@ -217,6 +217,7 @@ $config->openMethods[] = 'kanban.importbuild';
 $config->openMethods[] = 'kanban.activatecard';
 $config->openMethods[] = 'kanban.finishcard';
 $config->openMethods[] = 'kanban.deleteobjectcard';
+$config->openMethods[] = 'admin.ignore';
 
 /* Define the tables. */
 define('TABLE_COMPANY',       '`' . $config->db->prefix . 'company`');

module/admin/control.php

@@ -47,10 +47,10 @@ class admin extends control
      */
     public function ignore()
     {
+        $account = $this->app->user->account;
         $this->loadModel('setting');
-        $this->setting->deleteItems('owner=system&module=common&section=global&key=community');
         $this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
-        $this->setting->setItem('system.common.global.community', 'na');
+        $this->setting->setItem("$account.common.global.community", 'na');
         echo js::locate(inlink('index'), 'parent');
     }
 

module/convert/css/initjirauser.en.css

@@ -0,0 +1 @@
+#createForm table th {width: 125px;}

module/convert/lang/en.php

@@ -121,7 +121,7 @@ $lang->convert->jira->next             = 'Next';
 $lang->convert->jira->importFromDB     = 'Import From Database';
 $lang->convert->jira->importFromFile   = 'Import From File';
 $lang->convert->jira->mapJira2Zentao   = 'Map Jira To Zentao';
-$lang->convert->jira->dbNameNotice     = "Database";
+$lang->convert->jira->dbNameNotice     = "Please enter the Jira database name.";
 $lang->convert->jira->importNotice     = 'Notice: Importing data is risky! Make sure to complete the following steps in sequence before merging.';
 $lang->convert->jira->dbDesc           = '<p>If your Jira uses MySQL database, please choose this way.</p>';
 $lang->convert->jira->fileDesc         = '<p>Choose this method if your Jira uses a non-MySQL database.</p>';

module/convert/view/importnotice.html.php

@@ -35,7 +35,7 @@ li .form-control {margin-top: 10px}
         <li>
           <?php echo $lang->convert->jira->importSteps[$method][5];?>
           <?php if($method == 'db'):?>
-          <?php echo html::input('dbName', '', "class='form-control w-200px' placeholder={$lang->convert->jira->dbNameNotice}");?>
+          <div class='required w-250px'><?php echo html::input('dbName', '', "class='form-control' placeholder='{$lang->convert->jira->dbNameNotice}'");?></div>
           <?php endif;?>
         </li>
       </ol>

module/convert/view/initjirauser.html.php

@@ -23,14 +23,14 @@
           <td>
             <input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
             <span class='input-group'>
-              <?php echo html::password('password1', '', "class='form-control'");?>
+              <?php echo html::password('password1', '', "class='form-control' required");?>
             </span>
           </td>
           <td><?php echo $lang->convert->jira->passwordNotice;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->password2;?></th>
-          <td><?php echo html::password('password2', '', "class='form-control'");?></td>
+          <td><?php echo html::password('password2', '', "class='form-control' required");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->group;?></th>

module/convert/view/mapjira2zentao.html.php

@@ -26,19 +26,9 @@
         </li>
         <?php endforeach;?>
       </ul>
-      <div class='btn-toolbar pull-right'>
-        <?php 
-        if($step != 1)
-        {
-            $preStep = $step - 1;
-            echo html::a(inlink('mapJira2Zentao', "method=$method&dnname=$dbName&preStep=$preStep"), $lang->goback, '', "class='btn btn-wide'");
-        }
-        ?>
-        <?php echo html::submitButton($lang->convert->jira->next, "data-placement='bottom'");?>
-      </div>
     </div>
-    <?php if($step == 1):?>
     <table class='table table-form'>
+      <?php if($step == 1):?>
       <thead>
         <tr class='text-center'>
           <th><?php echo $lang->convert->jira->jiraObject;?></th>
@@ -54,11 +44,8 @@
         </tr>
         <?php endforeach;?>
       </tbody>
-    </table>
-    <hr />
-    <?php endif;?>
-    <?php if($step == 2):?>
-    <table class='table table-form'>
+      <?php endif;?>
+      <?php if($step == 2):?>
       <thead>
         <tr class='text-center'>
           <th><?php echo $lang->convert->jira->jiraLinkType;?></th>
@@ -74,11 +61,8 @@
         </tr>
         <?php endforeach;?>
       </tbody>
-    </table>
-    <hr />
-    <?php endif;?>
-    <?php if($step == 3):?>
-    <table class='table table-form'>
+      <?php endif;?>
+      <?php if($step == 3):?>
       <thead>
         <tr class='text-center'>
           <th><?php echo $lang->convert->jira->jiraResolution;?></th>
@@ -96,11 +80,8 @@
         </tr>
         <?php endforeach;?>
       </tbody>
-    </table>
-    <hr />
-    <?php endif;?>
-    <?php if($step == 4):?>
-    <table class='table table-form'>
+      <?php endif;?>
+      <?php if($step == 4):?>
       <thead>
         <tr class='text-center'>
           <th><?php echo $lang->convert->jira->jiraStatus;?></th>
@@ -122,7 +103,21 @@
         </tr>
         <?php endforeach;?>
       </tbody>
+      <?php endif;?>
+      <tfoot>
+        <tr>
+          <td colspan='<?php echo $step == 1 ? 2 : ($step == 4 ? 5 : $step);?>' class='text-center form-actions'>
+            <?php echo html::submitButton($lang->convert->jira->next, "data-placement='bottom'");?>
+            <?php
+            if($step != 1)
+            {
+                $preStep = $step - 1;
+                echo html::a(inlink('mapJira2Zentao', "method=$method&dnname=$dbName&preStep=$preStep"), $lang->goback, '', "class='btn btn-wide'");
+            }
+            ?>
+          </td>
+        </tr>
+      </tfoot>
     </table>
-    <?php endif;?>
   </form>
 </div>