From: mathieu <mathieu.boye28@gmail.com>
Date: Wed, 18 May 2016 15:59:02 +0000 (+0200)
Subject: Move scripts from advanceSearch.html to advanceSearch.js
X-Git-Tag: 1.6.2^2~15^2~1^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b2afdfd19b2f14e37545d6477b141d20e06c75a;p=telemeta.git

Move scripts from advanceSearch.html to advanceSearch.js
---

diff --git a/env/debug.env b/env/debug.env
index de027101..7a9fbbcc 100644
--- a/env/debug.env
+++ b/env/debug.env
@@ -18,4 +18,4 @@ BROKER_URL=redis://broker:6379/0
 # If this is True, all tasks will be executed locally by blocking until the task returns.
 CELERY_ALWAYS_EAGER=False
 
-REINDEX=False
\ No newline at end of file
+REINDEX=True
diff --git a/telemeta/static/telemeta/css/search.css b/telemeta/static/telemeta/css/search.css
index 3b81a62b..dd4f6ff2 100644
--- a/telemeta/static/telemeta/css/search.css
+++ b/telemeta/static/telemeta/css/search.css
@@ -50,7 +50,7 @@ form p {
     z-index: 1000;
 }
 
-select[name*="startBracket"] {
+select[name*="start_bracket"] {
     text-align: right;
 }
 
diff --git a/telemeta/static/telemeta/js/advanceSearch.js b/telemeta/static/telemeta/js/advanceSearch.js
index 70f13f58..66bb9a50 100644
--- a/telemeta/static/telemeta/js/advanceSearch.js
+++ b/telemeta/static/telemeta/js/advanceSearch.js
@@ -1,106 +1,263 @@
-$(document).ready(function() {
-            var nouvellesIcones = {
-                header : 'ui-icon-carat-1-e',
-                activeHeader : 'ui-icon-carat-1-s',
-
-
-            };
-
-            function getPrevUrlParameter(sParam){
-                var sPageURL = document.referrer.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
-
-            function getCurrUrlParameter(sParam){
-                var sPageURL = window.location.search.substring(1);
-                var sURLVariables = sPageURL.split('&');
-                for (var i = 0; i < sURLVariables.length; i++)
-                {
-                    var sParameterName = sURLVariables[i].split('=');
-                    if (sParameterName[0] == sParam)
-                    {
-                        return sParameterName[1];
-                    }
-                }
-            };
+$(document).ready(function () {
+    var nouvellesIcones = {
+        header: 'ui-icon-carat-1-e',
+        activeHeader: 'ui-icon-carat-1-s',
 
-            function scrollToElement(ele) {
-                $(document).scrollTop(ele.offset().top).scrollLeft(ele.offset().left);
-            };
 
+    };
 
-            var prev = getPrevUrlParameter("page");
-            var curr = getCurrUrlParameter("page");
-            var prespage = getPrevUrlParameter("results_page");
-            var crespage = getCurrUrlParameter("results_page");
-            if(prev<curr){
-                $(".fullpage").show( "slide", {direction:"right"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-
+    function getPrevUrlParameter(sParam) {
+        var sPageURL = document.referrer.substring(1);
+        var sURLVariables = sPageURL.split('&');
+        for (var i = 0; i < sURLVariables.length; i++) {
+            var sParameterName = sURLVariables[i].split('=');
+            if (sParameterName[0] == sParam) {
+                return sParameterName[1];
             }
-            else if(!curr || (prespage!=crespage)){
-                $(".fullpage").fadeIn(500);
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-            }
-            else if(!prev){
-                $(".fullpage").show( "slide", {direction:"right"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
+        }
+    };
+
+    function getCurrUrlParameter(sParam) {
+        var sPageURL = window.location.search.substring(1);
+        var sURLVariables = sPageURL.split('&');
+        for (var i = 0; i < sURLVariables.length; i++) {
+            var sParameterName = sURLVariables[i].split('=');
+            if (sParameterName[0] == sParam) {
+                return sParameterName[1];
             }
-            else{
-                $(".fullpage").show( "slide", {direction:"left"} );
-                if($("#anchor")){
-                    scrollToElement($("#anchor"));
-                }
-            };
-
-            $("#id_media_type").buttonset();
-            $("#id_viewable").buttonset();
-            $("#id_item_status").buttonset();
-            $("#id_ethnic_group").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_year_published_from").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_year_published_to").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recorded_from_date").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recorded_to_date").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_recording_context").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#id_physical_format").selectmenu({
-                icons : {button: "ui-icon-carat-2-n-s"}
-            }).selectmenu("menuWidget").addClass("overflow");
-            $("#selectAll").click(function(){
-                if(this.checked){
-                    $(".check1").each(function(){
-                        this.checked=true;
-                    });
-                }
-                else{
-                    $(".check1").each(function(){
-                        this.checked=false;
+        }
+    };
+
+    function scrollToElement(ele) {
+        $(document).scrollTop(ele.offset().top).scrollLeft(ele.offset().left);
+    };
+
+
+    var prev = getPrevUrlParameter("page");
+    var curr = getCurrUrlParameter("page");
+    var prespage = getPrevUrlParameter("results_page");
+    var crespage = getCurrUrlParameter("results_page");
+    if (prev < curr) {
+        $(".fullpage").show("slide", {direction: "right"});
+        if ($("#anchor")) {
+            scrollToElement($("#anchor"));
+        }
+
+    }
+    else if (!curr || (prespage != crespage)) {
+        $(".fullpage").fadeIn(500);
+        if ($("#anchor")) {
+            scrollToElement($("#anchor"));
+        }
+    }
+    else if (!prev) {
+        $(".fullpage").show("slide", {direction: "right"});
+        if ($("#anchor")) {
+            scrollToElement($("#anchor"));
+        }
+    }
+    else {
+        $(".fullpage").show("slide", {direction: "left"});
+        if ($("#anchor")) {
+            scrollToElement($("#anchor"));
+        }
+    }
+    ;
+
+    $("#id_media_type").buttonset();
+    $("#id_viewable").buttonset();
+    $("#id_item_status").buttonset();
+    $("#id_ethnic_group").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_year_published_from").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_year_published_to").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_recorded_from_date").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_recorded_to_date").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_recording_context").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#id_physical_format").selectmenu({
+        icons: {button: "ui-icon-carat-2-n-s"}
+    }).selectmenu("menuWidget").addClass("overflow");
+    $("#selectAll").click(function () {
+        if (this.checked) {
+            $(".check1").each(function () {
+                this.checked = true;
+            });
+        }
+        else {
+            $(".check1").each(function () {
+                this.checked = false;
+            });
+        }
+    });
+
+    function activate_autocomplete(selector, attribute) {
+
+        selector.each(function () {
+            var self = this;
+            $(this).autocomplete({
+                minLength: 3,
+                source: function (request, response) {
+                    $.ajax({
+                        url: '/search/autocomplete/',
+                        dataType: 'json',
+                        data: {
+                            q: $(self).val(),
+                            attr: ((attribute) ? attribute : $(self).attr('name'))
+                        },
+                        success: function (data) {
+                            response(data.results);
+                        }
                     });
                 }
             });
-	});
+        });
+
+    }
+
+    activate_autocomplete($('#id_code, #id_instruments, #id_collectors, #id_location'));
+
+    var colSort = [];
+
+
+    $.tablesorter.addParser({
+        id: 'numerised',
+        is: function (s) {
+            return false;
+        },
+        format: function (s, table, cell) {
+            var _class = $(cell).find('center span').attr('class');
+            _class = _class == undefined ? 1 : 0;
+            return _class;
+        },
+        type: 'number'
+    });
+
+
+    if (sessionStorage['sort'] && sessionStorage['order']) {
+        $.tablesorter.defaults.sortList = [[sessionStorage['sort'], sessionStorage['order']]];
+    }
+    else {
+        $.tablesorter.defaults.sortList = [[1, 0]];
+    }
+
+    $('#searchtable th').each(function (index) {
+        colSort[index] = $(this).text();
+    });
+
+
+    $('#searchtable th').on('click', function () {
+        var index = colSort.indexOf($(this).text());
+        var order = $.tablesorter.defaults.headerList[index]['order'];
+        if (index != sessionStorage['sort']) {
+            sessionStorage['order'] = 0;
+        }
+        else {
+            sessionStorage['order'] = (sessionStorage['order'] == 0) ? 1 : 0;
+        }
+        sessionStorage['sort'] = index;
+    });
+
+    $("#searchtable").tablesorter({
+        headers: {
+
+            0: {sorter: false},
+            2: {sorter: 'numerised'}
+        }
+
+    });
+
+
+    $('#dialog').dialog({
+        autoOpen: false,
+        width: '40%',
+        height: 600,
+    });
+
+    $('.fieldWrapper a').click(function () {
+        $('#dialog').dialog("open");
+    });
+
+    var deleteButton = '<a class="btn btn-default" id="del" href="#">' + gettrans('delete field') + '</a><br/>';
+
+    var tag = $('#copy').clone();
+    $(tag).children().each(function () {
+        $(this).val('').prop('checked', false).prop('selected', false);
+    });
+
+    function deleteField(e) {
+        e.preventDefault();
+        var number = $('input[name*="text_field"]').length;
+        if (number == 3) {
+            $('#del').remove();
+        }
+        $('#bloc-' + (number - 1)).remove();
+        $('#id_form-TOTAL_FORMS').attr('value', number - 1);
+
+    }
+
+    function addField(e) {
+        e.preventDefault();
+        var number = $('input[name*="text_field"]').length;
+        var tag_field = $(tag).clone().attr('id', 'bloc-' + number);
+        if (number == 2) {
+            $('#add').after(deleteButton);
+            $('#del').click(deleteField);
+        }
+        $('#add').before(tag_field);
+        $('#bloc-' + number).html($('#bloc-' + number).html().replace(/1/g, number));
+        activate_autocomplete($('#id_form-' + number + '-text_field'), 'instruments');
+        $('#id_form-TOTAL_FORMS').attr('value', number + 1);
+    }
+
+    $('#add').click(addField);
+
+    activate_autocomplete($('#id_form-0-text_field, #id_form-1-text_field'), 'instruments');
+
+    var interval = null;
+    var textInput = "";
+
+    $('#dialog form').on('submit change', function (e) {
+        if (e.type != 'keypress') e.preventDefault();
+        $.ajax({
+            url: '/search/booleaninstru/',
+            dataType: 'json',
+            data: $(this).serialize(),
+            success: function (donnees) {
+                if (e.type == 'submit' && !donnees.result.match(/\[ERROR\]/g)) {
+                    $("#dialog").dialog("close");
+                    $('#id_instruments').val(donnees.result);
+                }
+                $('#res').html(gettrans('final query') + " :<br/><strong>" + gettrans(donnees.result) + '</strong>');
+            },
+        });
+    });
+
+    $('#dialog input[type="text"]').on('focus', function () {
+        textInput = $(this).val();
+        var self = this;
+        interval = setInterval(function () {
+            if ($(self).val() != textInput) {
+                textInput = $(self).val();
+                $('#dialog form').trigger('change');
+            }
+        }, 500);
+    });
+
+    $('#dialog input[type="text"]').on('blur', function () {
+        clearInterval(interval);
+        textInput = ""
+    });
+
+
+});
diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index 5d7ae3de..b5ec1648 100644
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -242,9 +242,9 @@
                 {{ booleanForm.management_form}}
                 {% for form in booleanForm %}
                     {% if forloop.counter0 == 0 %}
-                        <span style="margin-left: 13.5%">{{ form.startBracket }}</span>
-                        {{ form.textField }}
-                        {{ form.endBracket }}
+                        <span style="margin-left: 13.5%">{{ form.start_bracket }}</span>
+                        {{ form.text_field }}
+                        {{ form.end_bracket }}
                     {% else %}
                         {% if forloop.counter0 == 1 %}
                         <div id="copy">
@@ -269,8 +269,9 @@
 {% endblock %}
 {% block extra_javascript %}
     <script src="{{ STATIC_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
+    <script src="{{ STATIC_URL }}telemeta/js/advanceSearch.js" type="text/javascript"></script>
+
     <script>
         $(function(){
             $("#results-per-page").selectmenu({
@@ -283,166 +284,4 @@
         });
 
 </script>
-    <script>
-$(function() {
-    function activate_autocomplete(selector, attribute) {
-
-    selector.each(function () {
-        var self = this;
-        $(this).autocomplete({
-            minLength: 3,
-            source: function (request, response) {
-                $.ajax({
-                    url: '/search/autocomplete/',
-                    dataType: 'json',
-                    data: {
-                        q: $(self).val(),
-                        attr: ((attribute) ? attribute : $(self).attr('name'))
-                    },
-                    success: function (data) {
-                        response(data.results);
-                    }
-                });
-            }
-        });
-    });
-
-}
-
-    activate_autocomplete($('#id_code, #id_instruments, #id_collectors, #id_location'));
-
-    var colSort = [];
-
-
-    $.tablesorter.addParser({
-        id: 'numerised',
-        is:function (s) {
-            return false;
-        },
-        format: function(s, table, cell){
-            var _class = $(cell).find('center span').attr('class');
-            _class = _class == undefined ? 1 : 0;
-            return _class;
-        },
-        type: 'number'
-    });
-
-
-    if(sessionStorage['sort'] && sessionStorage['order']){
-        $.tablesorter.defaults.sortList = [[sessionStorage['sort'], sessionStorage['order']]];
-    }
-    else{
-        $.tablesorter.defaults.sortList = [[1,0]];
-    }
-
-    $('#searchtable th').each(function (index) {
-        colSort[index]=$(this).text();
-    });
-
-
-    $('#searchtable th').on('click', function () {
-        var index = colSort.indexOf($(this).text());
-        var order = $.tablesorter.defaults.headerList[index]['order'];
-        if(index!=sessionStorage['sort']){
-            sessionStorage['order']=0;
-        }
-        else{
-            sessionStorage['order']=(sessionStorage['order']==0)?1:0;
-        }
-        sessionStorage['sort']=index;
-    });
-    
-    $("#searchtable").tablesorter({
-        headers: {
-
-            0:{sorter:false},
-            2: {sorter: 'numerised'}
-        }
-
-    });
-
-
-    $('#dialog').dialog({
-        autoOpen: false,
-        width: '40%',
-        height: 600,
-    });
-
-    $('.fieldWrapper a').click(function(){
-        $('#dialog').dialog("open");
-    });
-
-    var deleteButton = '<a class="btn btn-default" id="del" href="#">'+gettrans('delete field')+'</a><br/>';
-
-    var tag = $('#copy').clone();
-    $(tag).children().each(function () {
-        $(this).val('').prop('checked', false).prop('selected', false);
-    });
-
-    function deleteField(e) {
-        e.preventDefault();
-        var number = $('input[name*="textField"]').length;
-        if(number==3){
-            $('#del').remove();
-        }
-        $('#bloc-'+(number-1)).remove();
-        $('#id_form-TOTAL_FORMS').attr('value', number-1);
-
-    }
-
-    function addField(e) {
-        e.preventDefault();
-        var number = $('input[name*="textField"]').length;
-        var tagField = $(tag).clone().attr('id', 'bloc-'+number);
-        if(number==2){
-            $('#add').after(deleteButton);
-            $('#del').click(deleteField);
-        }
-        $('#add').before(tagField);
-        $('#bloc-'+number).html($('#bloc-'+number).html().replace(/1/g, number));
-        activate_autocomplete($('#id_form-'+number+'-textField'), 'instruments');
-        $('#id_form-TOTAL_FORMS').attr('value', number+1);
-    }
-
-    $('#add').click(addField);
-
-    activate_autocomplete($('#id_form-0-textField, #id_form-1-textField'), 'instruments');
-
-    var interval = null;
-    var textInput = "";
-
-    $('#dialog form').on('submit change', function (e) {
-        if(e.type!='keypress') e.preventDefault();
-        $.ajax({
-            url: '/search/booleaninstru/',
-            dataType: 'json',
-            data: $(this).serialize(),
-            success: function(data){
-                if(e.type=='submit' && !data.result.match(/\[ERROR\]/g)){
-                    $("#dialog").dialog("close");
-                    $('#id_instruments').val(data.result);
-                }
-                $('#res').html(gettrans('final query')+" :<br/><strong>"+gettrans(data.result)+'</strong>');
-            },
-        });
-    });
-
-    $('#dialog input[type="text"]').on('focus', function () {
-        textInput = $(this).val();
-        var self = this;
-       interval = setInterval(function () {
-            if($(self).val()!= textInput){
-                textInput = $(self).val();
-                $('#dialog form').trigger('change');
-            }
-       }, 500);
-    });
-
-    $('#dialog input[type="text"]').on('blur', function () {
-       clearInterval(interval);
-        textInput = ""
-    });
-
-});
-    </script>
 {% endblock %}
diff --git a/telemeta/templates/search/indexes/telemeta/instrument_text.txt b/telemeta/templates/search/indexes/telemeta/instrument_text.txt
index 28701c17..038e4c54 100644
--- a/telemeta/templates/search/indexes/telemeta/instrument_text.txt
+++ b/telemeta/templates/search/indexes/telemeta/instrument_text.txt
@@ -1 +1 @@
-{{ object.name }}
\ No newline at end of file
+{{ object.name|safe }}
\ No newline at end of file
diff --git a/telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt b/telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt
index 28701c17..038e4c54 100644
--- a/telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt
+++ b/telemeta/templates/search/indexes/telemeta/instrumentalias_text.txt
@@ -1 +1 @@
-{{ object.name }}
\ No newline at end of file
+{{ object.name|safe }}
\ No newline at end of file
diff --git a/telemeta/util/search_signals.py b/telemeta/util/search_signals.py
index 6bf32793..cf96b3f2 100644
--- a/telemeta/util/search_signals.py
+++ b/telemeta/util/search_signals.py
@@ -62,9 +62,6 @@ class RealTimeCustomSignal(signals.RealtimeSignalProcessor):
         InstrumentAliasIndex().remove_object(instance=instance.alias, using='autocomplete')
 
     def handle_save(self, sender, instance, **kwargs):
-        import sys
-        print(sender, self.update_fields)
-        sys.stdout.flush()
         if sender in self.handleModels:
             for field in self.update_fields:
                 getattr(self, "post_save_%s" % field)(instance)