Merge branch 'master' of https://github.com/easysoft/zentaopms

module/search/view/buildform.html.php

@@ -10,11 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php 
-$webRoot    = $this->app->getWebRoot();
-$jsRoot     = $webRoot . "js/";
+<?php
+$jsRoot = $this->app->getWebRoot() . "js/";
+include '../../common/view/datepicker.html.php';
 ?>
-<?php include '../../common/view/datepicker.html.php';?>
 <style>
 #bysearchTab {transition: all .3s cubic-bezier(.175, .885, .32, 1);}
 #bysearchTab.active {background: #fff; padding: 2px 10px 3px; padding-bottom: 2px\0; border: 1px solid #ddd; border-bottom: none}

module/tree/control.php

@@ -180,21 +180,6 @@ class tree extends control
         }
 
         $module = $this->tree->getById($moduleID);
-        if($module->owner == null and $module->root != 0)
-        {
-           $module->owner = $this->loadModel('product')->getById($module->root)->QD;
-        }
-
-        if($type == 'task')
-        {
-            $optionMenu = $this->tree->getTaskOptionMenu($module->root);
-            unset($optionMenu[0]);
-            $this->view->optionMenu = $optionMenu;
-        }
-        else
-        {
-            $this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type);
-        }
         $this->view->module = $module;
         $this->view->type   = $type;
         $this->view->users  = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);