diff --git a/module/productplan/model.php b/module/productplan/model.php index 8e0354c2be..e439e790c8 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -34,13 +34,13 @@ class productplanModel extends model /* 获取列表。*/ public function getList($product = 0) { - return $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product)->fetchAll(); + return $this->dao->select('*')->from(TABLE_PRODUCTPLAN)->where('product')->eq($product)->orderBy('begin')->fetchAll(); } /* 获取name=>value的键值对。*/ public function getPairs($product = 0) { - return array('' => '') + $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('product')->eq((int)$product)->fetchPairs(); + return array('' => '') + $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('product')->eq((int)$product)->orderBy('begin')->fetchPairs(); } /* 创建。*/ diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index a2cd83db74..fc09172328 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -32,20 +32,20 @@ - productplan->id;?> productplan->title;?> productplan->begin;?> productplan->end;?> + productplan->desc;?> actions;?> - id"), sprintf('%03d', $plan->id));?> - title;?> + id"), $plan->title);?> begin;?> end;?> + desc);?> id", $lang->productplan->edit); diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 104d3aa5d5..b55d51d15e 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -34,7 +34,6 @@ - release->id;?> release->name;?> release->build;?> release->date;?> @@ -44,8 +43,7 @@ - id"), sprintf('%03d', $release->id));?> - name;?> + id"), $release->name);?> buildName;?> date;?>