user_selects_default_login.diff

Patch - Savannah Durbin, 2010-05-14 00:54

Download (2.47 KB)

View differences:

app/controllers/account_controller.rb (working copy)
207 207
      cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
208 208
    end
209 209
    call_hook(:controller_account_success_authentication_after, {:user => user })
210
    redirect_back_or_default :controller => 'my', :action => 'page'
210
    if(UserPreference.find_by_user_id(user.id).default_homepage == "My Page")
211
    	redirect_to :controller => 'my', :action => 'page'
212
    else
213
	redirect_back_or_default :controller => 'my', :action => 'page'
214
    end
211 215
  end
212 216

  
213 217
  # Onthefly creation failed, display the registration form to fill/fix attributes
app/views/my/account.rhtml (working copy)
49 49
<p><%= pref_fields.check_box :hide_mail %></p>
50 50
<p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
51 51
<p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
52
<p><%= pref_fields.select :default_homepage, [[l(:field_index_page)], [l(:field_my_page)]] %></p>
52 53
<% end %>
53 54
</div>
54 55

  
app/views/issues/show.rhtml (working copy)
130 130
    <%= stylesheet_link_tag 'context_menu' %>
131 131
<% end %>
132 132
<div id="context-menu" style="display: none;"></div>
133
<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>
133
<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>
config/locales/en.yml (working copy)
282 282
  field_group_by: Group results by
283 283
  field_sharing: Sharing
284 284
  field_parent_issue: Parent task
285
  field_default_homepage: Default Login Page
286
  field_index_page: Index Page
287
  field_my_page: My Page
285 288
  
286 289
  setting_app_title: Application title
287 290
  setting_app_subtitle: Application subtitle