Merge branch 'master-alchemy' into PHRAS-1520_PORT_PHRAS-1464_1482_1483_1492_1496

2025-10-23 18:03:17 +00:00 · 2017-11-15 09:42:40 +04:00
parent e5a2397370 43a629169a
commit 55aabea716
11 changed files with 938 additions and 896 deletions
--- a/templates/web/admin/databox/databox.html.twig
+++ b/templates/web/admin/databox/databox.html.twig
@@ -189,7 +189,7 @@
                    <li>
                        <form class='form-inline' method="post" action="{{ path('admin_collection_enable', {'bas_id': baseId}) }}">
                            {{ baseId|bas_labels(app) }}
-                            <a href="#" class="btn btn-mini submiter">{{ "Activer" | trans }}></a>
+                            <a href="#" class="btn btn-mini reload submiter">{{ "Activer" | trans }}></a>
                        </form>
                    </li>
                {% endfor %}
@@ -375,6 +375,10 @@
                        } else if(submitLink.hasClass('reload-tree')) {
                            AdminApp.LeftView.reloadTree('bases:bases', true);
                        }
+                        //display message
+                        if (typeof datas.msg !== "undefined") {
+                            alert(datas.msg);
+                        }
                    } else {
                        alert(datas.msg);
                    }
--- a/templates/web/admin/editusers_timelimit.html.twig
+++ b/templates/web/admin/editusers_timelimit.html.twig
@@ -37,41 +37,45 @@
 </form>

 <script type="text/javascript">
-datePicker();
-function datePicker()
-{
-  var dates = $('.dmin, .dmax');
-  $('.dmin').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
+    $(document).ready(function () {
+        $.datepicker.setDefaults(datepickerLang);
+        datePicker();
+    });
+
+    function datePicker()
+    {
+      var dates = $('.dmin, .dmax');
+      $('.dmin').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      $('.dmax').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      {% if datas.limited_to %}
+        var instance = $('.dmin').data("datepicker");
+        $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+      {% endif %}
+      {% if datas.limited_from %}
+        var instance = $('.dmax').data("datepicker");
+        $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+      {% endif %}
    }
-  });
-  $('.dmax').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
-    }
-  });
-  {% if datas.limited_to %}
-    var instance = $('.dmin').data("datepicker");
-    $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
-  {% endif %}
-  {% if datas.limited_from %}
-    var instance = $('.dmax').data("datepicker");
-    $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
-  {% endif %}
-}
 </script>
--- a/templates/web/admin/editusers_timelimit_sbas.html.twig
+++ b/templates/web/admin/editusers_timelimit_sbas.html.twig
@@ -33,45 +33,48 @@
 </form>

 <script type="text/javascript">
-datePicker();
-function datePicker()
-{
-  var dates = $('.dmin, .dmax');
-  $('.dmin').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
+    $(document).ready(function () {
+        $.datepicker.setDefaults(datepickerLang);
+        datePicker();
+    });
+    function datePicker()
+    {
+      var dates = $('.dmin, .dmax');
+      $('.dmin').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      $('.dmax').datepicker({
+        defaultDate: -10,
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:'yy-mm-dd',
+        numberOfMonths: 3,
+        onSelect: function(selectedDate, instance) {
+          var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
+          var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
+          $(dates).not(':hidden').not(this).datepicker("option", option, date);
+        }
+      });
+      {% if datas.limited_to %}
+        var instance = $('.dmin').data("ui-datepicker");
+        if (instance) {
+            $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
+        }
+      {% endif %}
+      {% if datas.limited_from %}
+        var instance = $('.dmax').data("ui-datepicker");
+        if (instance) {
+            $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
+        }
+      {% endif %}
    }
-  });
-  $('.dmax').datepicker({
-    defaultDate: -10,
-    changeMonth: true,
-    changeYear: true,
-    dateFormat:'yy-mm-dd',
-    numberOfMonths: 3,
-    onSelect: function(selectedDate, instance) {
-      var option = $(this).hasClass("dmin") ? "minDate" : "maxDate";
-      var date = $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, selectedDate, instance.settings);
-      $(dates).not(':hidden').not(this).datepicker("option", option, date);
-    }
-  });
-  {% if datas.limited_to %}
-    var instance = $('.dmin').data("ui-datepicker");
-    if (instance) {
-        $('.dmin').datepicker("option", 'maxDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_to}}", instance.settings));
-    }
-  {% endif %}
-  {% if datas.limited_from %}
-    var instance = $('.dmax').data("ui-datepicker");
-    if (instance) {
-        $('.dmax').datepicker("option", 'minDate', $.datepicker.parseDate(instance.settings.dateFormat || $.datepicker._defaults.dateFormat, "{{datas.limited_from}}", instance.settings));
-    }
-  {% endif %}
-}
 </script>
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -54,6 +54,9 @@
            </fieldset>
        </form>

+        <button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
+        <button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>
+
        <form id="users_apply_template" method="post" action="{{ path('admin_users_apply_template') }}" target="_self" class="form-inline pull-left no-ajax" style="margin:0">
            <fieldset class="admin_head_opts">
                <span>{{ 'Apply a template' | trans }}</span>
@@ -77,45 +80,45 @@
        <table id="users" cellspacing="0"  cellpadding="0" border="0" class="admintable">
            <thead>
                <tr>
-                    <th style="text-align: center;" class="sortable {{ parm.srt == 'usr_id' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th style="text-align: center;" class="sortable {{ parm.srt == 'id' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur id utilisateur' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="usr_id" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="id" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'usr_login' ? 'sorted' :  '' }} ">
+                    <th class="sortable {{ parm.srt == 'login' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur identifiant' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="usr_login" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="login" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'usr_nom' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'first_name' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'First/Last Name' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="usr_nom" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="first_name" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'societe' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'company' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur societe' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="societe" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="company" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'usr_mail' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'email' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur email' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="usr_mail" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="email" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'pays' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'country' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur pays' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="pays" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="country" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'lastModel' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'last_model' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur dernier modele applique' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="lastModel" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="last_model" />
                    </th>
-                    <th class="sortable {{ parm.srt == 'usr_creationdate' ? 'sorted' :  '' }} {{ parm.ord == 'asc' ? 'sort_asc' :  'sort_desc' }}">
+                    <th class="sortable {{ parm.srt == 'created' ? 'sorted' :  '' }} {{ parm.ord == 'ASC' ? 'sort_asc' :  'sort_desc' }}">
                        <span>{{ 'admin::compte-utilisateur date de creation' | trans }}</span>
-                        <span class="ord_notifier">{{ parm.ord == 'asc' ? '&#x25bc;' :  '&#x25B2;' }}</span>
-                        <input type="hidden" name="srt" value="usr_creationdate" />
+                        <span class="ord_notifier">{{ parm.ord == 'ASC' ? '&#x25bc;' :  '&#x25B2;' }}</span>
+                        <input type="hidden" name="srt" value="created" />
                    </th>
                </tr>
            </thead>
@@ -207,8 +210,6 @@
                    {% set n_par_page = 50 %}
                    <option value="50" {% if parm['per_page'] == 50%}selected="selected"{% endif %}>{% trans with {'%n_par_page%' : n_par_page} %}%n_par_page% par page{% endtrans %}</option>
                </select>
-                <button class="user_modifier btn">{{ 'boutton::modifier' | trans }}</button>
-                <button class="user_deleter btn">{{ 'Supprimer' | trans }}</button>

                <input type="hidden" name="total_results" value="{{users.get_total()}}"/>
                <input type="hidden" name="page" value="{{users.get_page()}}"/>
@@ -268,11 +269,11 @@
                var sort = $('input', $this).val();

                if ((sort == $('#users_page_form input[name="srt"]').val())
-                        && ($('#users_page_form input[name="ord"]').val() == 'asc')) {
-                    var ord = 'desc';
+                        && ($('#users_page_form input[name="ord"]').val() == 'ASC')) {
+                    var ord = 'DESC';
                }
                else {
-                    var ord = 'asc';
+                    var ord = 'ASC';
                }

                $('#users_page_form input[name="srt"]').val(sort);
@@ -434,7 +435,7 @@
            });

            $('#users tbody tr, #users tbody td').on('dblclick', function (evt) {
-                $('#users_page_form .user_modifier').trigger('click');
+                $('.user_modifier').trigger('click');
            });

            $('#users tbody tr, #users tbody td').on('click', function (evt) {
@@ -543,7 +544,7 @@
                return false;
            });

-            $('#users_page_form .user_modifier').on('click', function () {
+            $('.user_modifier').on('click', function () {
                var users = p4.users.sel.join(';');
                if (users === '') {
                    return false;
@@ -564,7 +565,7 @@
                return false;
            });

-            $('#users_page_form .user_deleter').on('click', function () {
+            $('.user_deleter').on('click', function () {
                var users = p4.users.sel.join(';');
                if (users === '') {
                    return false;
@@ -649,6 +650,26 @@
                    });
                }
            });
+
+            $("#users_page_form .input-mini").keydown(function (e) {
+                if (e.which == 13) {
+                    //prevent form from being submitted
+                    e.preventDefault();
+                }
+            });
+            $("#users_page_form .input-mini").keyup(function (e) {
+                if (e.which == 13) {
+                    e.preventDefault();
+                    var form = $('#users_page_form');
+                    var current_page = parseInt($('.input-mini').val());
+                    var perPage = parseInt($('select[name="per_page"]', form).val());
+                    current_page = isNaN(current_page) || current_page < 1
+                    || current_page > {{ pages|floor }} ? 1 : current_page;
+                    var offset_start = (current_page-1) * perPage;
+                    $('input[name="offset_start"]', form).val(offset_start);
+                    $('#users_page_form').trigger('submit');
+                }
+            });
        });

  function exportlist()