Dev Applied custom modifications to Yii 1.1.18

LimeSurvey · Jun 6, 2017 · a7d44df · a7d44df
1 parent b86cf0b
commit a7d44df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/framework/web/widgets/captcha/CCaptcha.php b/framework/web/widgets/captcha/CCaptcha.php
@@ -128,7 +128,10 @@ public function registerClientScript()
 				$html=CHtml::button($label, $options);
 			else
 				$html=CHtml::link($label, $url, $options);
-			$js="jQuery('#$id').after(".CJSON::encode($html).");";
+
+			$js= "if(jQuery('#$id').next('input').length == 0){"
+			 . "jQuery('#$id').after(".CJSON::encode($html).");
+			 }";
 			$selector="#$buttonID";
 		}
 

diff --git a/framework/zii/widgets/assets/gridview/jquery.yiigridview.js b/framework/zii/widgets/assets/gridview/jquery.yiigridview.js
@@ -405,7 +405,11 @@
 			}
 			this.find('.' + settings.tableClass).children('tbody').children('tr').children('td').children('input[name="' + column_id + '"]').each(function (i) {
 				if (this.checked) {
-					checked.push(keys.eq(i).text());
+                    var val = keys.eq(i).text();
+                    if (val == '') {
+                        val = $(this).val();
+                    }
+					checked.push(val);
 				}
 			});
 			return checked;