diff --git a/trunk/module/release/config.php b/trunk/module/release/config.php new file mode 100644 index 0000000000..b5a5077eb3 --- /dev/null +++ b/trunk/module/release/config.php @@ -0,0 +1,3 @@ +release->create->requiredFields = 'name,build,date'; +$config->release->edit->requiredFields = 'name,build,date'; diff --git a/trunk/module/release/model.php b/trunk/module/release/model.php index e36edfeef7..3e8b7b584d 100644 --- a/trunk/module/release/model.php +++ b/trunk/module/release/model.php @@ -57,7 +57,7 @@ class releaseModel extends model ->specialChars('desc') ->add('product', (int)$productID) ->get(); - $this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck('name,date,build', 'notempty')->exec(); + $this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->exec(); if(!dao::isError()) return $this->dao->lastInsertID(); } @@ -68,7 +68,7 @@ class releaseModel extends model ->stripTags('name') ->specialChars('desc') ->get(); - $this->dao->update(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck('name,date,build', 'notempty')->where('id')->eq((int)$releaseID)->exec(); + $this->dao->update(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->edit->requiredFields, 'notempty')->where('id')->eq((int)$releaseID)->exec(); } /* 删除release。*/ diff --git a/trunk/module/release/view/create.html.php b/trunk/module/release/view/create.html.php index 7f76eb95b4..e0943e724c 100644 --- a/trunk/module/release/view/create.html.php +++ b/trunk/module/release/view/create.html.php @@ -30,7 +30,7 @@ release->create;?> release->name;?> - + release->build;?> @@ -38,17 +38,14 @@ release->date;?> - + + - - release->desc;?> - + - - - + diff --git a/trunk/module/release/view/edit.html.php b/trunk/module/release/view/edit.html.php index b52113ad82..5746426e96 100644 --- a/trunk/module/release/view/edit.html.php +++ b/trunk/module/release/view/edit.html.php @@ -30,23 +30,19 @@ release->edit;?> release->name;?> - + name, "class='text-3'");?> release->build;?> - - build, 'class="select-3"'); - ?> - + build, 'class="select-3"'); ?> release->date;?> - + date, "class='text-3 date'");?> release->desc;?> - + desc, "rows='10' class='area-1'");?> product);?>