* Finish task #4622,4625

db/update10.0.sql

@@ -1,5 +1,6 @@
 ALTER TABLE `zt_storyspec` CHANGE `title` `title` varchar(255) NOT NULL;
 update `zt_todo` set assignedTo = 'closed', assignedDate = closedDate where status = 'closed';
+DROP TABLE IF EXISTS `zt_webhookdatas`;
 
 ALTER TABLE `zt_action` DROP INDEX `action`;
 ALTER TABLE `zt_action` ADD INDEX `date` (`date`);

db/zentao.sql

@@ -925,18 +925,6 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `deleted` enum('0', '1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- DROP TABLE IF EXISTS `zt_webhookdatas`;
-CREATE TABLE IF NOT EXISTS `zt_webhookdatas` (
-  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-  `webhook` mediumint(8) unsigned NOT NULL,
-  `action` mediumint(8) unsigned NOT NULL,
-  `data` text NOT NULL,
-  `status` enum('wait', 'sended') NOT NULL DEFAULT 'wait',
-  `createdBy` varchar(30) NOT NULL,
-  `createdDate` datetime NOT NULL,
-  PRIMARY KEY `id` (`id`),
-  UNIQUE KEY `uniq` (`webhook`, `action`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_log`;
 CREATE TABLE IF NOT EXISTS `zt_log` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,

module/project/model.php

@@ -146,6 +146,8 @@ class projectModel extends model
             /* Replace for dropdown submenu. */
             if(isset($this->lang->project->subMenu->$key))
             {
+                $index     = 0;
+                $firstLink = '';
                 $dropTitle = '';
                 $hasActive = false;
                 $subMenu   = array();
@@ -170,8 +172,10 @@ class projectModel extends model
                         $dropTitle = $subMenuName;
                     }
 
-                    $replace .= "<li $active>" . html::a(helper::createLink($subMenuModule, $subMenuMethod, sprintf($subMenuParams, $projectID)), $subMenuName) . '</li>';
+                    $link = helper::createLink($subMenuModule, $subMenuMethod, sprintf($subMenuParams, $projectID));
+                    $replace .= "<li $active>" . html::a($link, $subMenuName) . '</li>';
                     if($active) $hasActive = true;
+                    if($index == 0) $firstLink = $link;
 
                     $link = array();
                     $link['module'] = $subMenuModule;
@@ -184,9 +188,11 @@ class projectModel extends model
                     $menu->text   = $subMenuName;
                     $menu->hidden = false;
                     $subMenu[] = $menu;
+
+                    $index++;
                 }
                 $replace .= '</ul>';
-                $replace  = "<a data-toggle='dropdown'>$dropTitle <span class='caret'></span></a>" . $replace;
+                $replace  = "<a href='$firstLink'>$dropTitle <span class='caret'></span></a>" . $replace;
 
                 $this->lang->project->menu->{$key}['class'] = 'dropdown dropdown-hover';
                 if($hasActive) $this->lang->project->menu->{$key}['class'] .= ' active';