kritbit Commit Details

Date:

2015-12-15 21:09:15 (9 years 3 months ago)

Author:

Natalie Adams

Branch:

master

Commit:

e6efc085eff3621b593f80df93c83b8fb8043162

Parents:

28a978ebaf4c1ac804a56b7144c33d6aa03255bd

Message:

Fixing link and default click action

Changes:

File differences

-106
107 107
108 108
109 
110 
109
110
111 111
112 112
113 
114 113
115 114
116 115
+␊
<script type="text/javascript">␊
    $(function () {␊
        $('#dropdown1 li').on('click', function(){␊
            $(this).preventDefault();␊
        $('#dropdown1 li').on('click', function(e){␊
            e.preventDefault();␊
            $("#runType").val($(this).data("type"));␊
            $("#selectedType").text($(this).text());␊
            //$('#datebox').val($(this).text());␊
        });␊
        $("#private").on("change", function () {␊
            if ($(this).is(":checked")) {␊
 ␊
 <script type="text/javascript">␊
     $(function () {␊
-        $('#dropdown1 li').on('click', function(){␊
-            $(this).preventDefault();␊
+        $('#dropdown1 li').on('click', function(e){␊
+            e.preventDefault();␊
             $("#runType").val($(this).data("type"));␊
             $("#selectedType").text($(this).text());␊
-            //$('#datebox').val($(this).text());␊
         });␊
         $("#private").on("change", function () {␊
             if ($(this).is(":checked")) {␊

-30
31 31
32 32
33 
33
34 34
35 35
36 36
+            <td>{{job.getLastRun}}</td>␊
            <td>{{job.last_result}}</td>␊
            <td><a class="btn btn-default" href="./history/view/{{job.jobName}}-{{job.id}}" role="button">History</a></td>␊
            <td><a class="btn btn-danger btn-delete" href="/job/delete/{{job.id}}" role="button">Delete</a></td>␊
            <td><a class="btn btn-danger btn-delete" href="./job/delete/{{job.id}}" role="button">Delete</a></td>␊
            {% if job.force_run == 1 %}␊
            <td><a class="btn btn-warning" href="./job/force/{{job.id}}" role="button">Enabled</a></td>␊
            {% else %}␊
             <td>{{job.getLastRun}}</td>␊
             <td>{{job.last_result}}</td>␊
             <td><a class="btn btn-default" href="./history/view/{{job.jobName}}-{{job.id}}" role="button">History</a></td>␊
-            <td><a class="btn btn-danger btn-delete" href="/job/delete/{{job.id}}" role="button">Delete</a></td>␊
+            <td><a class="btn btn-danger btn-delete" href="./job/delete/{{job.id}}" role="button">Delete</a></td>␊
             {% if job.force_run == 1 %}␊
             <td><a class="btn btn-warning" href="./job/force/{{job.id}}" role="button">Enabled</a></td>␊
             {% else %}␊