Fixed Default Locale
This commit is contained in:
		
							parent
							
								
									7cfd9080e8
								
							
						
					
					
						commit
						18a1701472
					
				| 
						 | 
				
			
			@ -21,7 +21,9 @@ class Admin::SitesController < OrbitBackendController
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  def update
 | 
			
		||||
    params[:site][:defalut_locale] = nil if params[:site][:default_locale].blank?
 | 
			
		||||
    if params[:site][:enable_language_detection]
 | 
			
		||||
      Site.update_all({:default_locale => nil})
 | 
			
		||||
    end
 | 
			
		||||
    @site.update_attributes(params[:site])
 | 
			
		||||
    redirect_to :back
 | 
			
		||||
  end
 | 
			
		||||
| 
						 | 
				
			
			@ -72,12 +74,12 @@ class Admin::SitesController < OrbitBackendController
 | 
			
		|||
    
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def reset_default_locale
 | 
			
		||||
    @site.defalut_locale = params[:default_locale]
 | 
			
		||||
    if @site.save
 | 
			
		||||
      render :nothing => true
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
  # def reset_default_locale
 | 
			
		||||
  #   @site.defalut_locale = params[:default_locale]
 | 
			
		||||
  #   if @site.save
 | 
			
		||||
  #     render :nothing => true
 | 
			
		||||
  #   end
 | 
			
		||||
  # end
 | 
			
		||||
 | 
			
		||||
  def change_design
 | 
			
		||||
    design = Design.find(params[:site_id]) rescue nil
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -262,7 +262,6 @@ delete locales;
 | 
			
		|||
<script type="text/javascript">
 | 
			
		||||
  $(".language-nav li a").click(function(){window.location.hash = $(this).attr("href")})
 | 
			
		||||
</script>>
 | 
			
		||||
<% content_for :page_specific_javascript do %>
 | 
			
		||||
  <script>
 | 
			
		||||
    $(document).ready(function(){
 | 
			
		||||
      $(document).on('change', '.reset_default_locale', function(){
 | 
			
		||||
| 
						 | 
				
			
			@ -274,7 +273,6 @@ delete locales;
 | 
			
		|||
      }); 
 | 
			
		||||
    }); 
 | 
			
		||||
  </script>
 | 
			
		||||
<% end %>
 | 
			
		||||
<script type="text/javascript">
 | 
			
		||||
$(function() { 
 | 
			
		||||
  $('a[data-toggle="tab"]').on('click', function (e) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -67,7 +67,7 @@ Orbit::Application.configure do
 | 
			
		|||
    :enable_starttls_auto => true,
 | 
			
		||||
    :openssl_verify_mode => 'none',
 | 
			
		||||
    :address => 'smtp.sendgrid.net',
 | 
			
		||||
    :port => '25',
 | 
			
		||||
    :port => '587',
 | 
			
		||||
    :domain => "new.tp.rulingcom.com",
 | 
			
		||||
    :authentication => "plain",
 | 
			
		||||
    :user_name => "rulingcom",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue