Changeset d47a15f in observatorio


Ignore:
Timestamp:
Oct 16, 2014, 5:51:07 PM (10 years ago)
Author:
eparedes <eparedes@…>
Branches:
master
Children:
0d419db
Parents:
4cf41e7 (diff), 1869ff0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://miv.cenditel.gob.ve/cadenas/scm/git/observatorio

File:
1 edited

Legend:

Unmodified
Added
Removed
  • procesos/templates/autenticar/usuario.html

    rc1c3dc1 r1869ff0  
    9696                    display: function (data) {
    9797                        if (data.record.estatus == 'SUCCESS') {
    98                             return "<a href='{{ BASE_URL }}/sig/geocadena/?grafo_id='" + data.record.task_id + "' " +
     98                            return "<a href='{{ BASE_URL }}/sig/geocadena/?grafo_id=" + data.record.task_id + "' " +
    9999                                    "target='_blank'><img src='{% static 'geocadena/imgs/icons/world.png' %}'></a>";
    100100                        }
Note: See TracChangeset for help on using the changeset viewer.