Manual merge action (refs #3176)

3 files changed, 18 insertions, 2 deletions

diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 44f4b0ba8..5972208ee 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -133,7 +133,11 @@ jQuery(document).ready(function(){
 {% else %}
   jQuery("#submit_form").click(function (){
     var mygrid = jQuery("#grid_{{name}}");
+    {% if multiple_select %}
+    jQuery("#hidden_{{name}}").val(mygrid.getGridParam('selarrrow'));
+    {% else %}
     jQuery("#hidden_{{name}}").val(mygrid.getGridParam('selrow'));
+    {% endif %}
     return true;
   });
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html
new file mode 100644
index 000000000..87dda6dcf
--- /dev/null
+++ b/ishtar_common/templates/ishtar/display_item.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load url from future %}
+{% block content %}
+<h2>{{page_name}}</h2>
+<script type='text/javascript'>
+$(function() {
+    load_window("{% url item_url pk %}");
+});
+</script>
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html
index 1e795c540..539bd0408 100644
--- a/ishtar_common/templates/ishtar/form.html
+++ b/ishtar_common/templates/ishtar/form.html
@@ -3,11 +3,12 @@
 {% block content %}
 <h2>{{page_name}}</h2>
 <div class='form'>
-<form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
+<form enctype="multipart/form-data" action="." method="post"{% if confirm %}
+    onsubmit='return confirm("{{confirm}}");'{% endif %}>{% csrf_token %}
 <table>
 {{form}}
 </table>
-<input type="submit" value="{% trans "Validate" %}"/>
+<input id="submit_form" type="submit" value="{% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %}"/>
 </form>
 </div>
 {% endblock %}