Manually rebased and taken for submission. Cheers, Alex
On Thu, Feb 12, 2015 at 11:40 AM, Barros Pena, Belen < [email protected]> wrote: > On 12/02/2015 11:23, "Michael Wood" <[email protected]> wrote: > > >On 11/02/15 12:20, Barros Pena, Belen wrote: > >> This works great, but could we generate the tooltip on hover only when > >>the > >> revision is truncated? It's just a bit silly to show the tooltip when > >>its > >> content shows exactly what you just hovered over. > > > >Sure please could you open a separate bug for that as it's not related > >to the vcs reference api patch > > Done > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=7312 > > Belén > > > > >> Thanks! > >> > >> Belén > >> > >> On 10/02/2015 16:44, "Michael Wood" <[email protected]> wrote: > >> > >>> Use the new layer_version api so that we return the vcs reference > >>>whether > >>> that be the commit hash, brash name or the upstream branch to which the > >>> layer > >>> is associated with. > >>> > >>> [YOCTO # > > >>>] > >>> > >>> Signed-off-by: Michael Wood <[email protected]> > >>> --- > >>> bitbake/lib/toaster/toastergui/templates/layerdetails.html | 13 > >>> ++++++------- > >>> 1 file changed, 6 insertions(+), 7 deletions(-) > >>> > >>> diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html > >>> b/bitbake/lib/toaster/toastergui/templates/layerdetails.html > >>> index 4ffd071..79679c2 100644 > >>> --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html > >>> +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html > >>> @@ -5,7 +5,7 @@ > >>> {% block localbreadcrumb %} > >>> <li><a href="{% url 'layers' %}">All layers</a></li> > >>> <li> > >>> - {{layerversion.layer.name}} > >>>({{layerversion.commit|truncatechars:13}}) > >>> + {{layerversion.layer.name}} > >>> ({{layerversion.get_vcs_reference|truncatechars:13}}) > >>> </li> > >>> {% endblock %} > >>> {% block projectinfomain %} > >>> @@ -29,7 +29,7 @@ > >>> layerVersion : { > >>> name : "{{layerversion.layer.name}}", > >>> id : {{layerversion.id}}, > >>> - commit: "{{layerversion.commit}}", > >>> + commit: "{{layerversion.get_vcs_reference}}", > >>> inCurrentPrj : {{layer_in_project}}, > >>> url : "{% url 'layerdetails' layerversion.id %}", > >>> sourceId: {{layerversion.layer_source_id}}, > >>> @@ -66,7 +66,7 @@ > >>> {% include "layers_dep_modal.html" %} > >>> <div class="row-fluid span11"> > >>> <div class="page-header"> > >>> - <h1>{{layerversion.layer.name}} <small class="commit" > >>> data-toggle="tooltip" > >>> > >>>title="{{layerversion.commit}}">({{layerversion.commit|truncatechars:13} > >>>}) > >>> </small></h1> > >>> + <h1>{{layerversion.layer.name}} <small class="commit" > >>> data-toggle="tooltip" > >>> > >>>title="{{layerversion.get_vcs_reference}}">({{layerversion.get_vcs_refer > >>>en > >>> ce|truncatechars:13}})</small></h1> > >>> </div> > >>> </div> > >>> > >>> @@ -144,10 +144,10 @@ > >>> </dd> > >>> <dt>Brach, tag or commit</dt> > >>> <dd> > >>> - <span > >>> class="current-value">{{layerversion.commit}}</span> > >>> + <span > >>> class="current-value">{{layerversion.get_vcs_reference}}</span> > >>> <form style="display:none;"> > >>> <div class="input-append"> > >>> - <input type="text" > >>>value="{{layerversion.commit}}"> > >>> + <input type="text" > >>> value="{{layerversion.get_vcs_reference}}"> > >>> <button data-layer-prop="commit" class="btn > >>> change-btn" type="button">Save</button> > >>> <a href="#" style="display:none" class="btn > >>> btn-link cancel">Cancel</a> > >>> </div> > >>> @@ -163,8 +163,7 @@ > >>> {% for ld in layerversion.dependencies.all %} > >>> <span class="current-value"> > >>> <li data-layer-id="{{ld.depends_on.id}}"> > >>> - <!-- TODO use ld.depends_on.get_vcs_reference > >>> instead of commit --> > >>> - <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> > >>> + <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> > >>> <span class="icon-trash " > >>>data-toggle="tooltip" > >>> title="Delete"></span> > >>> </li> > >>> </span> > >>> -- > >>> 2.1.0 > >>> > >>> -- > >>> _______________________________________________ > >>> toaster mailing list > >>> [email protected] > >>> https://lists.yoctoproject.org/listinfo/toaster > > > > -- > _______________________________________________ > toaster mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/toaster > -- Alex Damian Yocto Project SSG / OTC
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
