Merge branch 'release/0.27.0.0'

.travis.yml

@@ -4,6 +4,7 @@ branches:
   only:
     - master
     - develop
+    - alaveteli-pro-develop
 rvm:
   - 1.9.3
   - 2.0.0

Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.22.3'
+gem 'rails', '3.2.22.4'
 
 gem 'pg', '~> 0.18.4'
 
 # New gem releases aren't being done. master is newer and supports Rails > 3.0
 gem 'acts_as_versioned', :git => 'https://github.com/technoweenie/acts_as_versioned.git', :ref => '63b1fc8529d028'
 gem 'active_model_otp', :git => 'https://github.com/heapsource/active_model_otp.git', :ref => 'c342283fe564bf'
+gem 'cancancan', '1.12' # Pinned because 1.13 onwards don't support Ruby 1.9
 gem 'charlock_holmes', '~> 0.7.3'
 gem 'dynamic_form', '~> 1.1.4'
 # 4.1.0 has a bug in it which is fixed in a later version which does not have Ruby 1.9.3 support
@@ -66,6 +67,9 @@ group :assets do
   gem 'therubyracer', '~> 0.12.2'
 end
 
+# Feature flags
+gem 'alaveteli_features', :path => 'gems/alaveteli_features'
+
 group :test do
   gem 'fakeweb', '~> 1.3.0'
   gem 'coveralls', :require => false

Gemfile.lock

@@ -42,34 +42,43 @@ GIT
     acts_as_versioned (0.6.0)
       activerecord (>= 3.0.9)
 
+PATH
+  remote: gems/alaveteli_features
+  specs:
+    alaveteli_features (0.0.1)
+      flipper
+      flipper-active_record
+      mime-types (< 3.0.0)
+      rails (~> 3.2.22)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22.3)
-      actionpack (= 3.2.22.3)
+    actionmailer (3.2.22.4)
+      actionpack (= 3.2.22.4)
       mail (~> 2.5.4)
-    actionpack (3.2.22.3)
-      activemodel (= 3.2.22.3)
-      activesupport (= 3.2.22.3)
+    actionpack (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.22.3)
-      activesupport (= 3.2.22.3)
+    activemodel (3.2.22.4)
+      activesupport (= 3.2.22.4)
       builder (~> 3.0.0)
-    activerecord (3.2.22.3)
-      activemodel (= 3.2.22.3)
-      activesupport (= 3.2.22.3)
+    activerecord (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.22.3)
-      activemodel (= 3.2.22.3)
-      activesupport (= 3.2.22.3)
-    activesupport (3.2.22.3)
+    activeresource (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
+    activesupport (3.2.22.4)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.4.0)
@@ -83,6 +92,7 @@ GEM
     bullet (5.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
+    cancancan (1.12.0)
     capistrano (2.15.4)
       highline
       net-scp (>= 1.0.0)
@@ -158,6 +168,10 @@ GEM
       railties (>= 3.1.0)
     fast_gettext (1.1.0)
     ffi (1.9.10)
+    flipper (0.9.2)
+    flipper-active_record (0.9.2)
+      activerecord (>= 3.2, < 6)
+      flipper (~> 0.9.2)
     foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
@@ -215,7 +229,7 @@ GEM
     net-ssh (2.6.7)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    newrelic_rpm (3.17.1.326)
+    newrelic_rpm (3.18.0.329)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -247,20 +261,20 @@ GEM
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.2)
       rack (>= 1.0, < 3.0)
-    rails (3.2.22.3)
-      actionmailer (= 3.2.22.3)
-      actionpack (= 3.2.22.3)
-      activerecord (= 3.2.22.3)
-      activeresource (= 3.2.22.3)
-      activesupport (= 3.2.22.3)
+    rails (3.2.22.4)
+      actionmailer (= 3.2.22.4)
+      actionpack (= 3.2.22.4)
+      activerecord (= 3.2.22.4)
+      activeresource (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       bundler (~> 1.0)
-      railties (= 3.2.22.3)
+      railties (= 3.2.22.4)
     rails-i18n (3.0.1)
       i18n (~> 0.5)
       rails (>= 3.0.0, < 4.0.0)
-    railties (3.2.22.3)
-      actionpack (= 3.2.22.3)
-      activesupport (= 3.2.22.3)
+    railties (3.2.22.4)
+      actionpack (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -370,9 +384,11 @@ PLATFORMS
 DEPENDENCIES
   active_model_otp!
   acts_as_versioned!
+  alaveteli_features!
   annotate (~> 2.7.1)
   bootstrap-sass (~> 2.3.2.2)
   bullet (~> 5.1.0)
+  cancancan (= 1.12)
   capistrano (~> 2.15.4)
   capybara (~> 2.7.0)
   charlock_holmes (~> 0.7.3)
@@ -413,7 +429,7 @@ DEPENDENCIES
   quiet_assets (~> 1.1.0)
   rack (~> 1.4.6)
   rack-utf8_sanitizer (~> 1.3.0)
-  rails (= 3.2.22.3)
+  rails (= 3.2.22.4)
   rails-i18n (~> 3.0.0)
   rdoc (~> 3.12.2)
   recaptcha (~> 0.4.0)

app/assets/javascripts/alaveteli_pro/alaveteli_pro.js

@@ -0,0 +1,3 @@
+// ...
+//= require alaveteli_pro/selectize
+//= require alaveteli_pro/authority_select

app/assets/javascripts/alaveteli_pro/authority_select.js

@@ -0,0 +1,43 @@
+(function($){
+  $(function(){
+    var $select = $('.js-authority-select');
+    var $message = $('.js-outgoing-message-body');
+    var defaultAuthorityName = $message.data('salutation-body-name');
+    var currentAuthorityName = defaultAuthorityName;
+    var salutationTemplate = $message.data('salutation-template');
+
+    var updateSalutation = function updateSalutation(value) {
+      var oldAuthorityName = currentAuthorityName;
+      var oldSalutation = salutationTemplate.replace(defaultAuthorityName, oldAuthorityName);
+      var oldMessage = $message.val();
+
+      var newAuthorityName = $select.find('option:selected').text();
+      var newSalutation = salutationTemplate.replace(defaultAuthorityName, newAuthorityName);
+      var newMessage = oldMessage.replace(oldSalutation, newSalutation);
+
+      $message.val(newMessage);
+      currentAuthorityName = newAuthorityName;
+    };
+
+    $select.selectize({
+      valueField: 'id',
+      labelField: 'name',
+      searchField: 'name',
+      options: [],
+      create: false,
+      maxItems: 1,
+      render: {
+        option: function(body, escape) {
+          // No need to use escape because data is trusted (from our DB)
+          var html = '<div class="recipient-result">';
+          html += '<h4 class="name">' + body.name + '</h4>';
+          html += '<p class="description">' + body.notes + '</p>';
+          html += '<p class="requests">' + body.info_requests_visible_count + ' requests made</p>';
+          html += '</div>';
+          return html;
+        }
+      },
+      onChange: updateSalutation
+    });
+  });
+})(window.jQuery);

app/assets/javascripts/alaveteli_pro/request-index.js

@@ -0,0 +1,8 @@
+$(function() {
+    $('#request_filter_order').change(function() {
+        this.form.submit();
+    });
+    $('#request_filter_filter').change(function() {
+        this.form.submit();
+    });
+});