diff options
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 6d00da3061..465d633062 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | {% block localbreadcrumb %} | 5 | {% block localbreadcrumb %} |
| 6 | <li><a href="{% url 'layers' %}">All compatible layers</a></li> | 6 | <li><a href="{% url 'layers' %}">All compatible layers</a></li> |
| 7 | <li> | 7 | <li> |
| 8 | {{layerversion.layer.name}} ({{layerversion.commit|truncatechars:13}}) | 8 | {{layerversion.layer.name}} ({{layerversion.get_vcs_reference|truncatechars:13}}) |
| 9 | </li> | 9 | </li> |
| 10 | {% endblock %} | 10 | {% endblock %} |
| 11 | {% block projectinfomain %} | 11 | {% block projectinfomain %} |
| @@ -29,7 +29,7 @@ | |||
| 29 | layerVersion : { | 29 | layerVersion : { |
| 30 | name : "{{layerversion.layer.name}}", | 30 | name : "{{layerversion.layer.name}}", |
| 31 | id : {{layerversion.id}}, | 31 | id : {{layerversion.id}}, |
| 32 | commit: "{{layerversion.commit}}", | 32 | commit: "{{layerversion.get_vcs_reference}}", |
| 33 | inCurrentPrj : {{layer_in_project}}, | 33 | inCurrentPrj : {{layer_in_project}}, |
| 34 | url : "{% url 'layerdetails' layerversion.id %}", | 34 | url : "{% url 'layerdetails' layerversion.id %}", |
| 35 | sourceId: {{layerversion.layer_source_id}}, | 35 | sourceId: {{layerversion.layer_source_id}}, |
| @@ -66,7 +66,7 @@ | |||
| 66 | {% include "layers_dep_modal.html" %} | 66 | {% include "layers_dep_modal.html" %} |
| 67 | <div class="row-fluid span11"> | 67 | <div class="row-fluid span11"> |
| 68 | <div class="page-header"> | 68 | <div class="page-header"> |
| 69 | <h1>{{layerversion.layer.name}} <small class="commit" data-toggle="tooltip" title="{{layerversion.commit}}">({{layerversion.commit|truncatechars:13}})</small></h1> | 69 | <h1>{{layerversion.layer.name}} <small class="commit" data-toggle="tooltip" title="{{layerversion.get_vcs_reference}}">({{layerversion.get_vcs_reference|truncatechars:13}})</small></h1> |
| 70 | </div> | 70 | </div> |
| 71 | </div> | 71 | </div> |
| 72 | 72 | ||
| @@ -147,10 +147,10 @@ | |||
| 147 | Revision | 147 | Revision |
| 148 | </dt> | 148 | </dt> |
| 149 | <dd> | 149 | <dd> |
| 150 | <span class="current-value">{{layerversion.commit}}</span> | 150 | <span class="current-value">{{layerversion.get_vcs_reference}}</span> |
| 151 | <form style="display:none;"> | 151 | <form style="display:none;"> |
| 152 | <div class="input-append"> | 152 | <div class="input-append"> |
| 153 | <input type="text" value="{{layerversion.commit}}"> | 153 | <input type="text" value="{{layerversion.get_vcs_reference}}"> |
| 154 | <button data-layer-prop="commit" class="btn change-btn" type="button">Save</button> | 154 | <button data-layer-prop="commit" class="btn change-btn" type="button">Save</button> |
| 155 | <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> | 155 | <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> |
| 156 | </div> | 156 | </div> |
| @@ -166,8 +166,7 @@ | |||
| 166 | {% for ld in layerversion.dependencies.all %} | 166 | {% for ld in layerversion.dependencies.all %} |
| 167 | <span class="current-value"> | 167 | <span class="current-value"> |
| 168 | <li data-layer-id="{{ld.depends_on.id}}"> | 168 | <li data-layer-id="{{ld.depends_on.id}}"> |
| 169 | <!-- TODO use ld.depends_on.get_vcs_reference instead of commit --> | 169 | <a data-toggle="tooltip" title="{{ld.depends_on.layer.vcs_url}} | {{ld.depends_on.get_vcs_reference}}" href="{% url 'layerdetails' ld.depends_on.id %}">{{ld.depends_on.layer.name}}</a> |
| 170 | <a data-toggle="tooltip" title="{{ld.depends_on.layer.vcs_url}} | {{ld.depends_on.commit}}" href="{% url 'layerdetails' ld.depends_on.id %}">{{ld.depends_on.layer.name}}</a> | ||
| 171 | <span class="icon-trash " data-toggle="tooltip" title="Delete"></span> | 170 | <span class="icon-trash " data-toggle="tooltip" title="Delete"></span> |
| 172 | </li> | 171 | </li> |
| 173 | </span> | 172 | </span> |
