diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php index d349da38a2..73e968e854 100644 --- a/extension/lite/product/ext/control/browse.php +++ b/extension/lite/product/ext/control/browse.php @@ -184,6 +184,7 @@ class product extends control $this->view->storyType = $storyType; $this->view->from = $this->app->tab; $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array(); + $this->view->libs = $this->loadModel('assetlib')->getPairs('story'); $this->display(); } } diff --git a/module/story/model.php b/module/story/model.php index a996290c2f..519789b3fb 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -548,7 +548,7 @@ class storyModel extends model $productID = (int)$productID; $now = helper::now(); $mails = array(); - $stories = fixer::input('post')->get(); + $stories = fixer::input('post')->setDefault('type', 'story')->get(); $saveDraft = false; if(isset($stories->status)) @@ -575,11 +575,14 @@ class storyModel extends model $module = $stories->module[$i] == 'ditto' ? $module : $stories->module[$i]; $plan = isset($stories->plan[$i]) ? ($stories->plan[$i] == 'ditto' ? $plan : $stories->plan[$i]) : ''; $pri = $stories->pri[$i] == 'ditto' ? $pri : $stories->pri[$i]; - $source = $stories->source[$i] == 'ditto' ? $source : $stories->source[$i]; + $source = (empty($stories->source[$i]) || $stories->source[$i] == 'ditto') ? $source : $stories->source[$i]; $stories->module[$i] = (int)$module; $stories->plan[$i] = $plan; $stories->pri[$i] = (int)$pri; $stories->source[$i] = $source; + if(empty($stories->category[$i])) $stories->category[$i] = ''; + if(empty($stories->sourceNote[$i])) $stories->sourceNote[$i] = ''; + if(empty($stories->verify[$i])) $stories->verify[$i] = ''; } if(isset($stories->uploadImage)) $this->loadModel('file');