radiant-reader-extension 3.0.30 → 3.0.31

data/app/controllers/admin/group_invitations_controller.rb

@@ -58,7 +58,7 @@ private
       csv = line.collect {|value| value ? value.gsub(/^ */, '').chomp : ''}
       input = {}
       input[:honorific] = csv.shift if Radiant::Config['reader.show_honorifics?']
-      [:forename, :surname, :email, :phone].each {|field| input[field] = csv.shift}
+      [:forename, :surname, :email, :phone, :post_organisation].each {|field| input[field] = csv.shift}
       r = Reader.find_by_email(input[:email]) || Reader.new(input)
       r.create_password!    # only for validation purposes: not saved nor passed through
       r.valid?              # so that errors can be shown on the confirmation form

data/app/views/admin/group_invitations/new.html.haml

@@ -13,7 +13,7 @@
           %span.formnote
             - if Radiant::Config['reader.show_honorifics?']
               title or rank, 
-            forename, surname, email, [phone]
+            forename, surname, email, [phone], [organisation]
         = text_area_tag "readerlist", params[:readerlist], :class => "textarea", :style => "width: 100%; height: 240px;"
 
       %p.buttons

data/app/views/admin/group_invitations/preview.html.haml

@@ -17,6 +17,7 @@
         %th= t('activerecord.attributes.reader.surname')
         %th= t('activerecord.attributes.reader.email')
         %th= t('activerecord.attributes.reader.phone')
+        %th= t('activerecord.attributes.reader.post_organisation')
     %tbody
       - i = 0
       - @readers.each do |reader| 
@@ -35,6 +36,8 @@
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email)
             %td 
               = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone)
+            %td 
+              = text_field_tag "reader_#{i}[post_organisation]", reader.post_organisation, :class => "preview#{ ' with_error' if reader.errors.on(:post_organisation)}", :title => reader.errors.on(:post_organisation)
         - else
           %tr.invite
             %td
@@ -50,6 +53,8 @@
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email), :disabled => true
             %td 
               = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone), :disabled => true
+            %td 
+              = text_field_tag "reader_#{i}[post_organisation]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:post_organisation)}", :title => reader.errors.on(:post_organisation), :disabled => true
         - i = i + 1
 
   %p.buttons

data/lib/message_tags.rb

@@ -54,6 +54,30 @@ module MessageTags
       tag.locals.recipient.send(field)
     end
   end
+  
+  desc %{
+    Displays the organisation recorded for the current recipient.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "recipient:organisation" do |tag|
+    tag.locals.recipient.post_organisation
+  end
+
+  desc %{
+    Expands if the current recipient has an organisation.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "recipient:if_organisation" do |tag|
+    tag.expand unless tag.locals.recipient.post_organisation.blank?
+  end
+  
+  desc %{
+    Expands unless the current reader has an organisation.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "recipient:unless_organisation" do |tag|
+    tag.expand if tag.locals.recipient.post_organisation.blank?
+  end
 
   desc %{
     Only for use in email messages. Displays the password of the reader currently being emailed, if we still have it.

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.30'
+  VERSION = '3.0.31'
   SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS}
   DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.}
   URL = "http://radiant.spanner.org/reader"

data/lib/reader_tags.rb

@@ -86,6 +86,30 @@ module ReaderTags
     end
   end
   
+  desc %{
+    Displays the organisation recorded for the current reader.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "reader:organisation" do |tag|
+    tag.locals.reader.post_organisation if tag.locals.reader
+  end
+
+  desc %{
+    Expands if the current reader has an organisation.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "reader:if_organisation" do |tag|
+    tag.expand unless tag.locals.reader.post_organisation.blank?
+  end
+
+  desc %{
+    Expands unless the current reader has an organisation.
+    <pre><code><r:reader:organisation /></code></pre>
+  }
+  tag "reader:unless_organisation" do |tag|
+    tag.expand if tag.locals.reader.post_organisation.blank?
+  end
+  
   desc %{
     Displays the standard reader_welcome block, but only if a reader is present. For a block that shows an invitation to non-logged-in
     people, use @r:reader_welcome@

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 3
   - 0
-  - 30
-  version: 3.0.30
+  - 31
+  version: 3.0.31
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -359,7 +359,7 @@ files:
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.30'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
+post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.31'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: