New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

form: render signatures in children were incompatible with parent(Form) #3349

Open
wants to merge 1 commit into
base: develop
from
Jump to file or symbol
Failed to load files and symbols.
+6 −6
Diff settings

Always

Just for now

form: render signatures in children were incompatible with parent(Form)

  • Loading branch information...
kurtbr committed Sep 7, 2016
commit bde15e2acec29a26c73918ae17aa0774fb5048c4
View
@@ -1069,7 +1069,7 @@ function getSource() {
return array();
}
function render($options=array()) {
function render($staff=true, $title=false, $options=array()) {
$rv = $this->getWidget()->render($options);
if ($v = $this->get('visibility')) {
$v->emitJavascript($this);
@@ -2281,7 +2281,7 @@ function getChoices($verbose=false) {
$criteria = $this->getCriteria();
$agents = array();
if (($dept=$config['dept']) && $dept->assignMembersOnly()) {
if (($members = $dept->getAvailableMembers()))
if (($members = $dept->getMembers($criteria)))
foreach ($members as $member)
$agents[$member->getId()] = $member;
} else {
@@ -4108,7 +4108,7 @@ function isValid($include=false) {
return !$this->errors();
}
function render($options) {
function render($staff=true, $title=false, $options=array()) {
switch(strtolower($options['template'])) {
case 'simple':
@@ -4238,7 +4238,7 @@ function isValid($include=false) {
return !$this->errors();
}
function render($options) {
function render($staff=true, $title=false, $options=array()) {
switch(strtolower($options['template'])) {
case 'simple':
@@ -45,7 +45,7 @@
<tr><td colspan=2>
<?php
$options = array('template' => 'simple', 'form_id' => 'assign');
$form->render($options);
$form->render(true, false, $options);
?>
</td> </tr>
</tbody>
@@ -40,7 +40,7 @@ class="mass-action"
<tr><td colspan=2>
<?php
$options = array('template' => 'simple', 'form_id' => 'transfer');
$form->render($options);
$form->render(true, false, $options);
?>
</td> </tr>
</tbody>
ProTip! Use n and p to navigate between commits in a pull request.