Skip to content
Snippets Groups Projects
Commit a7d1885f authored by Jared Hancock's avatar Jared Hancock
Browse files

forms: Fix multiselect widgets in advanced search

parent 591ba7e3
No related branches found
No related tags found
No related merge requests found
...@@ -1626,6 +1626,12 @@ class PhoneNumberWidget extends Widget { ...@@ -1626,6 +1626,12 @@ class PhoneNumberWidget extends Widget {
} }
class ChoicesWidget extends Widget { class ChoicesWidget extends Widget {
static $media = array(
'css' => array(
'/css/jquery.multiselect.css',
),
);
function render($mode=false) { function render($mode=false) {
if ($mode && $mode == 'view') { if ($mode && $mode == 'view') {
...@@ -1683,8 +1689,6 @@ class ChoicesWidget extends Widget { ...@@ -1683,8 +1689,6 @@ class ChoicesWidget extends Widget {
<?php <?php
if ($config['multiselect']) { if ($config['multiselect']) {
?> ?>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.multiselect.min.js"></script>
<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/jquery.multiselect.css"/>
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$("#<?php echo $this->name; ?>") $("#<?php echo $this->name; ?>")
......
...@@ -37,6 +37,7 @@ if (($lang = Internationalization::getCurrentLanguage()) ...@@ -37,6 +37,7 @@ if (($lang = Internationalization::getCurrentLanguage())
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.10.3.custom.min.js"></script>
<script src="<?php echo ROOT_PATH; ?>js/osticket.js"></script> <script src="<?php echo ROOT_PATH; ?>js/osticket.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.multiselect.min.js"></script>
<script src="<?php echo ROOT_PATH; ?>scp/js/bootstrap-typeahead.js"></script> <script src="<?php echo ROOT_PATH; ?>scp/js/bootstrap-typeahead.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script>
......
...@@ -23,6 +23,7 @@ if (($lang = Internationalization::getCurrentLanguage()) ...@@ -23,6 +23,7 @@ if (($lang = Internationalization::getCurrentLanguage())
<script type="text/javascript" src="./js/scp.js"></script> <script type="text/javascript" src="./js/scp.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.pjax.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery.multiselect.min.js"></script>
<script type="text/javascript" src="./js/tips.js"></script> <script type="text/javascript" src="./js/tips.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script> <script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/redactor-osticket.js"></script>
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
<?php <?php
echo csrf_token(); echo csrf_token();
$config = $field->getConfiguration(); $config = $field->getConfiguration();
foreach ($field->getConfigurationForm() as $name=>$f) { $form = new Form($field->getConfigurationForm());
echo $form->getMedia();
foreach ($form->getFields() as $name=>$f) {
if (isset($config[$name])) if (isset($config[$name]))
$f->value = $config[$name]; $f->value = $config[$name];
else if ($f->get('default')) else if ($f->get('default'))
......
...@@ -639,7 +639,9 @@ if ($results) { ...@@ -639,7 +639,9 @@ if ($results) {
<input class="dp" type="input" size="20" name="endDate"> <input class="dp" type="input" size="20" name="endDate">
</fieldset> </fieldset>
<?php <?php
foreach (TicketForm::getInstance()->getFields() as $f) { $tform = TicketForm::objects()->one();
echo $tform->getForm()->getMedia();
foreach ($tform->getInstance()->getFields() as $f) {
if (in_array($f->get('type'), array('text', 'memo', 'phone', 'thread'))) if (in_array($f->get('type'), array('text', 'memo', 'phone', 'thread')))
continue; continue;
elseif (!$f->hasData()) elseif (!$f->hasData())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment