You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2012/10/09 22:17:30 UTC
git commit: [#4571] ensure new project icons are shown to the
uploader right away
Updated Branches:
refs/heads/db/4571 dc43dde86 -> cff47605a
[#4571] ensure new project icons are shown to the uploader right away
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cff47605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cff47605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cff47605
Branch: refs/heads/db/4571
Commit: cff47605a856aeb0f26710b0e6d7954fc506a8cf
Parents: dc43dde
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Oct 9 20:17:23 2012 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Oct 9 20:17:23 2012 +0000
----------------------------------------------------------------------
.../templates/admin_widgets/metadata_admin.html | 2 +-
Allura/allura/model/project.py | 2 +-
Allura/allura/templates/jinja_master/nav_menu.html | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cff47605/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index fc68236..b822fd9 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -52,7 +52,7 @@
<div id="project-icon" class="viewing">
{% if value.icon %}
<div class="viewer" style="overflow: auto">
- <img src="{{value.url()}}/icon" style="float:left; margin-right: 1em;" alt="">
+ <img src="{{value.url()}}/icon?{{value.icon._id.generation_time}}" style="float:left; margin-right: 1em;" alt="">
<a id="edit-icon" href="#" title="Edit" style="display:inline-block;margin-top:15px"><b data-icon="p" class="ico ico-pencil"></b></a>
<a id="delete-icon" href="#" title="Remove" style="display:inline-block;margin-top:15px"><b data-icon="d" class="ico ico-delete"></b></a>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cff47605/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index dbe92ff..9580b25 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -247,7 +247,7 @@ class Project(MappedClass, ActivityNode, ActivityObject):
project_id=self._id,
category='screenshot')).all()
- @property
+ @LazyProperty
def icon(self):
return ProjectFile.query.get(
project_id=self._id,
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cff47605/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index 156db2c..a795f86 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -20,8 +20,10 @@
<a href="{{c.project.url()}}">
{% if c.project.user_project_of %}
{{lib.gravatar(c.project.user_project_of, size=48, className='project_icon')}}
- {% elif c.project.icon %}
- <img src="{{c.project.url()}}/icon" class="project_icon" alt="Project Logo">
+ {% else %}
+ {% if c.project.icon %}
+ <img src="{{c.project.url()}}/icon?{{c.project.icon._id.generation_time}}" class="project_icon" alt="Project Logo">
+ {% endif %}
{% endif %}
<h1 class="project_title">
{% if c.project.is_nbhd_project %}