diff --git a/db/update17.0.beta1.sql b/db/update17.0.beta1.sql deleted file mode 100644 index 6b2a1656df..0000000000 --- a/db/update17.0.beta1.sql +++ /dev/null @@ -1,2 +0,0 @@ -insert into zt_config(vision, owner, module, `key`, value) select 'rnd', 'system', 'story', 'forceReviewUsers', `value` from zt_config where vision='rnd' and owner='system' and module='story' and `key`='forceReview'; -insert into zt_config(vision, owner, module, `key`, value) select 'lite', 'system', 'story', 'forceReviewUsers', `value` from zt_config where vision='lite' and owner='system' and module='story' and `key`='forceReview'; diff --git a/module/custom/control.php b/module/custom/control.php index 4fd1ba3be8..6ed32f35e7 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -77,7 +77,7 @@ class custom extends control { $this->view->depts = $this->loadModel('dept')->getDeptPairs(); $this->view->forceReviewAll = zget($this->config->$module, 'forceReviewAll', 'false'); - $this->view->forceReviewUsers = zget($this->config->$module, 'forceReviewUsers', ''); + $this->view->forceReview = zget($this->config->$module, 'forceReview', ''); $this->view->forceReviewRoles = zget($this->config->$module, 'forceReviewRoles', ''); $this->view->forceReviewDepts = zget($this->config->$module, 'forceReviewDepts', ''); } @@ -126,7 +126,7 @@ class custom extends control $data = fixer::input('post') ->setDefault('forceReviewAll', 0) ->setDefault('forceReviewDepts', '') - ->join('forceReviewUsers', ',') + ->join('forceReview', ',') ->join('forceReviewRoles', ',') ->join('forceReviewDepts', ',') ->join('forceReviewAll', ',') diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index b6a328bfed..4e1a38ed76 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -112,7 +112,7 @@ EOT;