diff --git a/module/productplan/model.php b/module/productplan/model.php index 45e5834360..14834e9b49 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -159,14 +159,19 @@ class productplanModel extends model */ public function batchUpdate($productID) { - $data = fixer::input('post')->get(); + $data = fixer::input('post')->skipSpecial('desc')->get(); $oldPlans = $this->getByIDList($data->id); + $this->app->loadClass('purifier', true); + $config = HTMLPurifier_Config::createDefault(); + $purifier = new HTMLPurifier($config); + $plans = array(); foreach($data->id as $planID) { $plan = new stdclass(); $plan->title = $data->title[$planID]; + $plan->desc = $purifier->purify($data->desc[$planID]); $plan->begin = $data->begin[$planID]; $plan->end = $data->end[$planID]; diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index 5afcf9258b..33d0fe9509 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -21,6 +21,7 @@ productplan->id?> productplan->title?> + productplan->desc?> productplan->begin?> productplan->end?> @@ -30,13 +31,14 @@ id . html::hidden("id[$plan->id]", $plan->id);?> id]", $plan->title, "class='form-control'")?> + id]", $plan->desc, "class='form-control' rows='1'")?> id]", $plan->begin, "class='form-control form-date'")?> id]", $plan->end, "class='form-control form-date'")?> - + diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index ec5569fa87..6cbdd2bc99 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -22,7 +22,7 @@ id&branch=$branch", '', 'button', 'plus');?> -
id&branch=$branch")?>'> +id&branch=$branch")?>'> recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -73,4 +73,5 @@
+ diff --git a/www/js/my.full.js b/www/js/my.full.js index 7621e37fd7..6b318e4d00 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1371,6 +1371,10 @@ function fixedTfootAction(formID) var $tfoot = $table.find('tfoot'); $tfoot.removeClass('fixedTfootAction'); + var $inputgroup = $tfoot.find('.table-actions').children('.input-group'); + if($inputgroup.size() > 0)var $inputwidth = $inputgroup.width(); + + var tfootOffset = $tfoot.offset().top + $tfoot.height(); var windowH = $(window).height(); var tableWidth = $table.width(); @@ -1379,7 +1383,7 @@ function fixedTfootAction(formID) $tfoot.addClass('fixedTfootAction'); $tfoot.width(tableWidth); $tfoot.find('td').width(tableWidth); - $tfoot.find('td .input-group').width('150'); + if($inputgroup.size() > 0) $inputgroup.width($inputwidth); } $(window).scroll(function() { @@ -1395,7 +1399,7 @@ function fixedTfootAction(formID) $tfoot.addClass('fixedTfootAction'); $tfoot.width(tableWidth); $tfoot.find('td').width(tableWidth); - $tfoot.find('td .input-group').width('150'); + if($inputgroup.size() > 0) $inputgroup.width($inputwidth); } }); }