Changeset 33072

Timestamp:

09/22/11 16:18:50 (2 years ago)

Author:

pmacadden

Message:

se corrigen errores en los widgets que utilizan la librería chosen y se corrige pequeño error en el widget pmWidgetFormPropelJQuerySearch donde si el valor era nulo mostraba uno cualquiera

Files:

• plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormChosenChoice.class.php (modified) (5 diffs)
• plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormDoctrineChosenChoice.class.php (modified) (2 diffs)
• plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormPropelChosenChoice.class.php (modified) (2 diffs)
• plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/pmWidgetFormPropelJQuerySearch.class.php (modified) (1 diff)
• plugins/dcReloadedFormExtraPlugin/trunk/web/css/chosen.css (modified) (1 diff)
• plugins/dcReloadedFormExtraPlugin/trunk/web/js/chosen.jquery.js (moved) (moved from plugins/dcReloadedFormExtraPlugin/trunk/web/js/chosen.jquery.min.js) (2 diffs)

plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormChosenChoice.class.php

@@ -26 +26 @@
-  public static function getJavaScriptsIncludes()
-  {
-min.
+
-  }
-
@@ -40 +40 @@
-  }
-
-
+, $default_text
-  {
-    $tpl = <<<EOF
-<script>
-  jQuery(document).ready(function(){
-
+, default_text:'%default_text%'
-  });
-</script>
@@ -51 +51 @@
-    return strtr($tpl, array(
-      "%widget_id%" => $id,
-
+
+
-    ));
-  }
@@ -72 +73 @@
-    $default_text = $this->getOption('default_text', null);
-    if($default_text){
-attributes['data-placeholder']
+default_text
-    }
-    else{
-attributes['data-placeholder']
+default_text
-    }
-    $align_right = $this->getOption('align_right', null);
@@ -91 +92 @@
-    }
-    $html = parent::render($name, $value, $attributes, $errors);
-
+, $default_text
-    return $html;
-  }

plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormDoctrineChosenChoice.class.php

@@ -42 +42 @@
-    $default_text = $this->getOption('default_text', null);
-    if($default_text){
-attributes['data-placeholder']
+default_text
-    }
-    else{
-attributes['data-placeholder']
+default_text
-    }
-    $align_right = $this->getOption('align_right', null);
@@ -61 +61 @@
-    }
-    $html = parent::render($name, $value, $attributes, $errors);
-
+, $default_text
-    return $html;
-  }

plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/dcWidgetFormPropelChosenChoice.class.php

@@ -41 +41 @@
-    $default_text = $this->getOption('default_text', null);
-    if($default_text){
-attributes['data-placeholder']
+default_text
-    }
-    else{
-attributes['data-placeholder']
+default_text
-    }
-    $align_right = $this->getOption('align_right', null);
@@ -60 +60 @@
-    }
-    $html = parent::render($name, $value, $attributes, $errors);
-
+, $default_text
-    return $html;
-  }

plugins/dcReloadedFormExtraPlugin/trunk/lib/widget/pmWidgetFormPropelJQuerySearch.class.php

@@ -47 +47 @@
-  public function getValueString($value)
-  {
+    if(is_null($value)){
+      return '';
+    }
-    $class = constant($this->getOption("model")."::PEER");      
-    $object = call_user_func(array($class,  $this->getOption('retrieve_object_method')), $value);
-    
-    $method = $this->getOption("method");
-    

plugins/dcReloadedFormExtraPlugin/trunk/web/css/chosen.css

@@ -332 +332 @@
-  padding: 4px 5px 4px 20px;
-}
-
+
+
+
+
+
+
+
+
+

plugins/dcReloadedFormExtraPlugin/trunk/web/js/chosen.jquery.js

@@ -1 +1 @@
-// Chosen, a Select Box Enhancer for jQuery and Protoype
-// by Patrick Filler for Harvest, http://getharvest.com
- 
+
-// Version 0.9.3
-// Full source at https://github.com/harvesthq/chosen
@@ -8 +8 @@
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `cake build`, do not edit it by hand.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+