damned-lies r1513 - in trunk: . templates/vertimus vertimus

[claudep svn gnome org]

Author: claudep
Date: Tue Mar 24 15:37:51 2009
New Revision: 1513
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1513&view=rev

Log:
2009-03-24  Claude Paroz  <claude 2xlibre net>

	* templates/vertimus/vertimus_detail.html:
	* vertimus/views.py: Add a note in vertimus detail when there is activity
	on another branch of the same module. So when a module branches in a
	release, it's easier to see that there is some ongoing activity in another
	branch (e.g. HEAD).

Modified:
   trunk/ChangeLog
   trunk/templates/vertimus/vertimus_detail.html
   trunk/vertimus/views.py

Modified: trunk/templates/vertimus/vertimus_detail.html
==============================================================================
--- trunk/templates/vertimus/vertimus_detail.html	(original)
+++ trunk/templates/vertimus/vertimus_detail.html	Tue Mar 24 15:37:51 2009
@@ -61,6 +61,15 @@
 </table>
 {% endif %}
 
+{% if other_states %}
+<div style="margin-top:0.5em;">
+  <img src="{{ MEDIA_URL }}img/warn.png" alt="Warning logo" /> {% trans "On-going activities in same module:" %}
+  {% for st in other_states %}
+  <a href="{% url vertimus-ids-view st.branch.pk st.domain.pk st.language.pk %}">{{ st.branch.name }}</a>
+  {% endfor %}
+</div>
+{% endif %}
+
 {% if action_history %}
 <h2>{% trans "Action History" %}</h2>
 <div>

Modified: trunk/vertimus/views.py
==============================================================================
--- trunk/vertimus/views.py	(original)
+++ trunk/vertimus/views.py	Tue Mar 24 15:37:51 2009
@@ -64,6 +64,7 @@
         branch=branch,
         domain=domain,
         language=language)
+    other_branch_states = StateDb.objects.filter(domain=domain, language=language).exclude(branch=branch.pk).exclude(name='None')
 
     state = state_db.get_state()
     action_history = ActionDb.get_action_history(state_db)
@@ -97,6 +98,7 @@
         'pageSection': 'module',
         'stats': stats,
         'branch': branch,
+        'other_states': other_branch_states,
         'domain': domain,
         'language': language,
         'module': branch.module,