Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

4 files changed, 61 insertions, 47 deletions

diff --git a/app/views/admin_request/_some_annotations.html.erb b/app/views/admin_request/_some_annotations.html.erb
new file mode 100644
index 000000000..dfd46f828
--- /dev/null
+++ b/app/views/admin_request/_some_annotations.html.erb
@@ -0,0 +1,48 @@
+<% if comments.size > 0 %>
+  <div class="accordion" id="comments">
+    <% for comment in comments %>
+      <div class="accordion-group">
+        <div class="accordion-heading">
+         <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a>
+         <%= link_to admin_request_edit_comment_path(comment) do %>
+            #<%=comment.id%>
+            --
+            <%=h(comment.user.name)%>
+            <%=admin_value(comment.created_at)%>
+            <% end %>
+          <blockquote class="incoming-message">
+            <%= truncate(comment.body, :length => 400) %>
+          </blockquote>
+        </div>
+        <div id="comment_<%=comment.id%>" class="accordion-body collapse">
+          <table class="table table-striped table-condensed">
+            <tbody>
+              <tr>
+                <td colspan="2">
+                 By <%= user_both_links(comment.user) %>
+                </td>
+              </tr>
+              <% comment.for_admin_column do |name, value, type, column_name |%>
+                <tr>
+                  <td>
+                    <b><%=name%></b>
+                  </td>
+                  <td>
+                    <% if column_name == 'body' && !comment.visible %>
+                      <s><%=h comment.send(column_name) %></s>
+                    <% else %>
+                      <%=h comment.send(column_name) %>
+                    <% end %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% else %>
+  <p>None yet.</p>
+<% end %>
+ 
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb
index 83d9c3764..2589e52b4 100644
--- a/app/views/admin_request/show.html.erb
+++ b/app/views/admin_request/show.html.erb
@@ -325,53 +325,8 @@
 <hr>
 <h2>Annotations</h2>
 
-<% if @info_request.comments.size > 0 %>
-  <div class="accordion" id="comments">
-    <% for comment in @info_request.comments %>
-      <div class="accordion-group">
-        <div class="accordion-heading">
-         <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a>
-         <%= link_to admin_request_edit_comment_path(comment) do %>
-            #<%=comment.id%>
-            --
-            <%=h(comment.user.name)%>
-            <%=admin_value(comment.created_at)%>
-            <% end %>
-          <blockquote class="incoming-message">
-            <%= truncate(comment.body, :length => 400) %>
-          </blockquote>
-        </div>
-        <div id="comment_<%=comment.id%>" class="accordion-body collapse">
-          <table class="table table-striped table-condensed">
-            <tbody>
-              <tr>
-                <td colspan="2">
-                 By <%= user_both_links(comment.user) %>
-                </td>
-              </tr>
-              <% comment.for_admin_column do |name, value, type, column_name |%>
-                <tr>
-                  <td>
-                    <b><%=name%></b>
-                  </td>
-                  <td>
-                    <% if column_name == 'body' && !comment.visible %>
-                      <s><%=h comment.send(column_name) %></s>
-                    <% else %>
-                      <%=h comment.send(column_name) %>
-                    <% end %>
-                  </td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% else %>
-  <p>None yet.</p>
-<% end %>
+<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @info_request.comments } %>
+
 <hr>
 <h2>Mail server delivery logs</h2>
 
diff --git a/app/views/admin_user/show.html.erb b/app/views/admin_user/show.html.erb
index c93c08e50..6d12aeff5 100644
--- a/app/views/admin_user/show.html.erb
+++ b/app/views/admin_user/show.html.erb
@@ -91,6 +91,12 @@
 
 <hr>
 
+<h2>Annotations</h2>
+
+<%= render :partial => 'admin_request/some_annotations' , :locals => { :comments => @admin_user.comments } %>
+
+<hr>
+
 <h2>Censor rules</h2>
 <%= render :partial => 'admin_censor_rule/show', :locals => { :censor_rules => @admin_user.censor_rules, :user => @admin_user } %>
 
diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index 8917fd577..7d47a5990 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -66,6 +66,11 @@ ensure_line_present \
     /etc/postfix/main.cf 644
 
 ensure_line_present \
+    "^ *myhostname *=" \
+    "myhostname = $(hostname --fqdn)" \
+    /etc/postfix/main.cf 644
+
+ensure_line_present \
     "^do-not-reply" \
     "do-not-reply-to-this-address:        :blackhole:" \
     /etc/aliases 644