Merge branch 'vipin-shrivastava-master' into 1.0

uvdesk · Dec 24, 2021 · def0b78 · def0b78
2 parents b7f33dc + 223bcfc
commit def0b78
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Resources/views/savedReplyForm.html.twig b/Resources/views/savedReplyForm.html.twig
@@ -177,6 +177,10 @@
 					,{
 						pattern: '^(?!.*[!@#$%^&*()<_+])',
 						msg: "{{ 'Name must have characters only' }}"
+					},
+					{
+						maxLength:100,
+						msg: "{{ 'This field contain maximum 100 characters.'|trans }}"
 					}
 					],
 				}

diff --git a/Resources/views/ticket.html.twig b/Resources/views/ticket.html.twig
@@ -566,7 +566,7 @@
 
                                     <ul class="uv-search-list type" data-action="type">
                                         {% for type in ticketTypeCollection %}
-                                            <li data-index="{{ type.id }}"><a href="#">{{ type.description }}</a></li>
+                                            <li data-index="{{ type.id }}"><a href="#">{{ type.code }}</a></li>
                                         {% endfor %}
                                     </ul>
                                 </div>

diff --git a/Resources/views/ticketTypeAdd.html.twig b/Resources/views/ticketTypeAdd.html.twig
@@ -78,14 +78,27 @@
 		$(function () {
 			var TypeModel = Backbone.Model.extend({
 				validation: {
-					'code': {
+					'code': [{
 						required: true,
 						msg: "{{ 'This field is mandatory'|trans }}"
+					}
+					,{
+						pattern: '^(?!.*[!@#$%^&*()<_+])',
+						msg: "{{ 'Name must have characters only' }}"
 					},
-					'description': {
+					,{
+						maxLength:200,
+						msg: "{{ 'This field contain maximum 100 characters.'|trans }}"
+					}],
+					'description': [{
 						required: true,
 						msg: "{{ 'This field is mandatory'|trans }}"
 					}
+					,{
+						maxLength:200,
+						msg: "{{ 'This field contain maximum 200 characters.'|trans }}"
+					}
+					],
 				}
 			});