Преглед изворни кода

Customer portal : Creating a request from services catalog now redirects to "on going requests" page

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4135 a333f486-631f-4898-b8df-5754b55c2be0
glajarige пре 9 година
родитељ
комит
49e261fe8b

+ 2 - 2
datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig

@@ -59,8 +59,8 @@
 			field_set: oFieldSet_{{ sFormIdSanitized }},
 			submit_btn_selector: $('#{{ sFormId }}').parent().find('.form_btn_submit, .form_btn_transition'),
 			cancel_btn_selector: $('#{{ sFormId }}').parent().find('.form_btn_cancel'),
-			submit_url: {% if form.submit_callback is not null %}"{{ form.submit_callback }}"{% else %}null{% endif %},
-			cancel_url: {% if form.cancel_callback is not null %}"{{ form.cancel_callback }}"{% else %}null{% endif %},
+			submit_url: {% if form.submit_callback is not null %}"{{ form.submit_callback|raw }}"{% else %}null{% endif %},
+			cancel_url: {% if form.cancel_callback is not null %}"{{ form.cancel_callback|raw }}"{% else %}null{% endif %},
 			endpoint: "{{ form.renderer.GetEndpoint()|raw }}",
 			is_modal: {% if tIsModal == true %}true{% else %}false{% endif %}
 		});

+ 6 - 0
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -1077,6 +1077,7 @@
                           <rules>
                             <rule id="contact-to-userrequest"/>
                             <rule id="servicesubcategory-to-userrequest"/>
+							<rule id="go-to-open-request-on-submit"/>
                           </rules>
                         </action>
                       </actions>
@@ -1472,6 +1473,11 @@
             <preset id="2">copy(service_id, service_id)</preset>
           </presets>
         </action_rule>
+		<action_rule id="go-to-open-request-on-submit">
+			<submit xsi:type="goto">
+				<brick>ongoing-tickets-for-portal-user</brick>
+			</submit>
+		</action_rule>
       </action_rules>
     </module_design>
   </module_designs>