gistfile1.txt

### YOUR MERGE PULL ###

$ git show 1892f20e452104c73ddad3041dedc491857e3e3a
commit 1892f20e452104c73ddad3041dedc491857e3e3a
Merge: 247604b 2d9c153
Author: Mike McCune <mmccune@gmail.com>
Date:   Thu Sep 20 08:26:54 2012 -0700

    Merge pull request #716 from knowncitizen/857499
    
    857499 - Fix for user with no orgs or perms.

### The actual commit from the above PR, the 'right most' commit from the 2 SHAs: 2d9c153 ###
### Merge: 247604b 2d9c153
###                ^^^^^^^

$ git show 2d9c153
commit 2d9c153859c565370b296439936e1013ce0e2455
Author: Jason E. Rist <jrist@redhat.com>
Date:   Wed Sep 19 18:48:58 2012 -0600

    857499 - Fix for user with no orgs or perms.

diff --git a/src/app/controllers/user_sessions_controller.rb b/src/app/controllers/user_sessions_controller.rb
index 59c754e..5423e19 100644
--- a/src/app/controllers/user_sessions_controller.rb
+++ b/src/app/controllers/user_sessions_controller.rb
@@ -100,6 +100,10 @@ class UserSessionsController < ApplicationController
           # notice the user
           notify.success _("Login Successful, logging into '%s' ") % user_default_org.name
           set_org
+        elsif orgs.length < 1
+          # notice the user, please choose an org
+          notify.success _("Login Successful, please contact administrator to get permission to access an organization.")
+          render :partial =>"/user_sessions/interstitial.js.haml", :locals=> {:num_orgs => orgs.length, :redir_path => dashboard_index
         else
           # notice the user, please choose an org
           notify.success _("Login Successful, please choose an Organization")

$ git cherry-pick -x 2d9c153
[SYSTEM-ENGINE-1.1 09cbee6] 857499 - Fix for user with no orgs or perms. (cherry picked from commit 2d9c153859c565370b296439936e1013ce0e2455)
 Author: Jason E. Rist <jrist@redhat.com>
 1 file changed, 4 insertions(+)