From 50582cdbd8447542296526e5a335693ff7f0c4ee Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 24 Oct 2014 15:15:13 +0800
Subject: [PATCH] back to in use locales for pages and links

---
 app/controllers/pages_controller.rb | 8 ++++----
 app/views/pages/_form.html.erb      | 4 ++--
 app/views/pages/_form_link.html.erb | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 29aad4f..0caef1f 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -392,8 +392,8 @@ class PagesController < ApplicationController
     p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: [:en, :zh_tw],external_url_translations: [:en, :zh_tw])
     p["url"] = @url
     if p["external_url_translations"]
-      p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"")
-      p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"")
+      p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present?
+      p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present?
     end
     p
   end
@@ -407,8 +407,8 @@ class PagesController < ApplicationController
     p["enabled_for_sitemap"] = p["enabled_for_sitemap"] || []
     p["enabled_for_mobile"] = p["enabled_for_mobile"] || 0
     if p["external_url_translations"]
-      p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"")
-      p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"")
+      p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present?
+      p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present?
     end
     p
   end
diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb
index 284b035..a90baa6 100644
--- a/app/views/pages/_form.html.erb
+++ b/app/views/pages/_form.html.erb
@@ -11,7 +11,7 @@
 	<% end %>
 </div>
 <div class="control-group">
-	<% @site_valid_locales.each do |locale| %>
+	<% @site_in_use_locales.each do |locale| %>
 	<%= f.label :locale, "#{t(:title)} #{t(locale)}" %>
  	<div class="controls">
 		<%= f.fields_for :name_translations do |n| %>
@@ -170,7 +170,7 @@
 <div class="control-group" id="enable-menu">
 	<div class="controls">
 		<label class="control-label"><%= t(:is_published) %> :</label>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 			<label class="checkbox">
 			  <input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> />
 			  <%= t(locale.to_s) %>
diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb
index 3a4cd05..471f793 100644
--- a/app/views/pages/_form_link.html.erb
+++ b/app/views/pages/_form_link.html.erb
@@ -16,7 +16,7 @@
 </div>
 
 <div class="control-group">
-	<% @site_valid_locales.each do |locale| %>
+	<% @site_in_use_locales.each do |locale| %>
 	<label class="control-label"><%= "#{t(:title)} #{t(locale)}" %></label>
  	<div class="controls">
 		<%= f.fields_for :name_translations do |n| %>
@@ -26,7 +26,7 @@
 	<% end %>
 </div>
 <div class="control-group">
-	<% @site_valid_locales.each do |locale| %>
+	<% @site_in_use_locales.each do |locale| %>
 	<label class="control-label"><%= "#{t(:url)} #{t(locale)}" %></label>
  	<div class="controls">
 		<%= f.fields_for :external_url_translations do |n| %>
@@ -50,7 +50,7 @@
 <div class="control-group" id="enable-menu">
 	<div class="controls">
 		<label class="control-label"><%= t(:is_published) %> :</label>
-		<% @site_valid_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 			<label class="checkbox">
 			  <input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> />
 			  <%= t(locale.to_s) %>