diff --git a/module/bug/config.php b/module/bug/config.php index dc3c6ef002..3746a33905 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -50,7 +50,7 @@ $config->bug->fieldList['branch']['dataSource'] = array('module' => 'bug', 'meth $config->bug->fieldList['module']['control'] = 'select'; $config->bug->fieldList['module']['title'] = 'module'; -$config->bug->fieldList['module']['dataSource'] = array('module' => 'bug', 'method' => 'getRelatedObjects', 'params' => 'module&id,name'); +$config->bug->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&bug'); $config->bug->fieldList['project']['title'] = 'project'; $config->bug->fieldList['project']['control'] = 'hidden'; diff --git a/module/port/model.php b/module/port/model.php index 166325f7fc..9bb367ab05 100644 --- a/module/port/model.php +++ b/module/port/model.php @@ -244,7 +244,7 @@ class portModel extends model $this->commonActions($model); - if(!empty($this->modelConfig->fieldList[$field]['title'])) $title = $this->modelLang->{$this->modelConfig->fieldList[$field]['title']}; + if(!empty($this->modelConfig->fieldList[$field]['title'])) return $this->modelLang->{$this->modelConfig->fieldList[$field]['title']}; if(array_key_exists($field, $this->lang->$model)) { $title = $this->lang->$model->$field; diff --git a/module/port/view/showimport.html.php b/module/port/view/showimport.html.php index d3d863a3e0..3d1a174883 100644 --- a/module/port/view/showimport.html.php +++ b/module/port/view/showimport.html.php @@ -25,7 +25,6 @@ $(function() if(parseInt($('#maxImport').val())) $('#times').html(Math.ceil(parseInt($('#allCount').html()) / parseInt($('#maxImport').val()))); }); - $('#import').click(function(){ $.cookie('maxImport', $('#maxImport').val()); location.href = "";