Revert "more button fix and also new way to select more page."

This reverts commit e129b25554.

app/controllers/admin/page_parts_controller.rb

@@ -12,8 +12,6 @@ class Admin::PagePartsController < OrbitBackendController
     @module_app_categories = @module_app.categories
     @module_app_tags = @module_app.tags
     @widget_paths = ModuleApp.find(@module_app.id).widgets.map{|name, data| [t(data["i18n"]), name]} rescue []
-    @pages = Page.where(:module_app_id => @module_app.id)
-
     if @part.widget_path.present?
       if @part.widget_path.eql?("default_widget")
         @checked_style = @part.widget_style
@@ -29,10 +27,7 @@ class Admin::PagePartsController < OrbitBackendController
         # @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
         @frontend_styles =  @module_app.widgets[@part.widget_path]["style"] rescue nil
         @partial = 'custom_widget' if @frontend_styles.present?
-        
       end
-      @partial = 'more_link' unless @partial
-
     end
     @data_count = @module_app.get_registration.get_data_count.to_a rescue []
     @no_orbit_bar = @side_bar = @no_header = true
@@ -79,7 +74,6 @@ class Admin::PagePartsController < OrbitBackendController
   def get_display_style
     @part = PagePart.find(params[:id]) rescue nil
     @module_app = ModuleApp.find(params[:module_id]) rescue nil
-    @pages = Page.where(:module_app_id => @module_app.id)
     if @module_app
       if params[:val].eql?("default_widget")
         @checked_style = @part.widget_path.present? ? @part.widget_style : nil if @part && @part.widget_path.eql?("default_widget")
@@ -94,8 +88,6 @@ class Admin::PagePartsController < OrbitBackendController
         @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
         @partial = 'custom_widget' if @frontend_styles.present?
       end
-      @partial = 'more_link' unless @partial
-      
     end
   end
 

app/controllers/default_widget_controller.rb

@@ -39,7 +39,6 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   def default_widget
-
     @search = params["search_query"].blank?  ?  false : true
     if !params[:id].blank? and !params["clicked_field_name"].blank?
       clicked_field_name = params["clicked_field_name"].to_sym
@@ -92,8 +91,6 @@ class DefaultWidgetController< OrbitWidgetController
         @tag_class = 'default_widget_typeC'
         @partial = "typeC"
       end
-      @more_url = Page.find(@page_part.more_link).path rescue nil
-      # debugger
     end
   end
   

app/controllers/pages_controller.rb

@@ -70,6 +70,7 @@ class PagesController < ApplicationController
       elsif params[:category_id].is_a? String
         options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
     end
+    
     if params[:tag_id].is_a? Array
       options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
       elsif params[:category_id].is_a? String
@@ -80,7 +81,7 @@ class PagesController < ApplicationController
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
     uri = URI::escape(url + options)
-    # uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
+    #uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
     redirect_to(uri)unless save_from_no_lang_for_page
   end
    
@@ -104,7 +105,6 @@ class PagesController < ApplicationController
   protected
    
   def get_item
-    
     if params[:page_id]
       @item = Item.find(params[:page_id])
     elsif params[:same_page_id]

app/models/page_part.rb

@@ -12,7 +12,6 @@ class PagePart
   field :widget_path
   field :category,type: Array, :default => []
   field :tag, type: Array,:default => []
-  field :more_link_page_id
   
   field :widget_style
   field :widget_field , :type => Array,:default => []

app/views/admin/page_parts/_custom_widget.html.erb

@@ -4,12 +4,6 @@
     <%= select 'page_part', 'widget_style', @frontend_styles, {:selected => (@part && @part[:widget_style])}, class: "input-xlarge" %>
   </div>
 </div>
-<div class="control-group input-content">
-  <label class="control-label muted">More Link</label>
-  <div class="controls">
-    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
-  </div>
-</div>
 
 <div class="control-group input-content">
 <% @module_app.widget_options.tap { |widget|%>
@@ -25,8 +19,8 @@
            <% else%>
             <div class="controls">
             <%= select_tag "page_part[widget_options][#{key}]", options_for_select(options,(@part.widget_options[key] rescue nil)), class: "input-xlarge" %>
-            </div>
           <% end %>
+          </div>
         <% end %>
    <% } %>
 <% } %>

app/views/admin/page_parts/_default_widget.html.erb

@@ -74,12 +74,6 @@
     </table>
   </div>
 </div>
-<div class="control-group input-content">
-  <label class="control-label muted">More Link</label>
-  <div class="controls">
-    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
-  </div>
-</div>
 
 <script>
   $('.typesetting li').each(function(index, el) {

app/views/admin/page_parts/_more_link.html.erb

@@ -1,6 +0,0 @@
-<div class="control-group input-content">
-   <label class="control-label muted">More Link</label>
-    <div class="controls">
-    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
- 	</div>
-</div>

app/views/default_widget/default_widget.html.erb

@@ -4,10 +4,6 @@
 	<% if @paginate %>
 	  <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
 	<% elsif @page_part.module_app %>
-	
-	  <%#= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
-
-	  <%= @page_part.module_app.get_registration.default_widget_setting.short_link_to_more(request,@more_url) %>
-	  
+	  <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
 	<% end %>
 <% end %>

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: orbit_site_new
+  database: test_site
 
 
 
 test:
   <<: *defaults
-  database: orbit_site_new
+  database: test_site
 
 # set these environment variables on your prod server
 production:

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -12,19 +12,12 @@ module DefaultWidgetTagHelper
       if param.is_a?(Array) and !param.blank?
         params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
         params.delete index
-        params_str = params_str + "&"
       end
     end  
+    
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()
       end
   end
-
-  def short_link_to_more(req,url)
-    @request = req
-     content_tag :div,:class=> 'more' do 
-      link_to I18n.t(@more_link[:label_i18n]),url
-      end
-  end
 end

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

@@ -11,6 +11,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
   def index
 
     @part = PagePart.find(params[:part_id])
+  
     if @part.widget_data_count
       @page_num = @part.widget_data_count
     else
@@ -63,7 +64,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
       @web_link_datas << { "title" => wlcg.title, "web_links" => web_link_datas } if !@web_links.blank?
 
     end
-    @more_url = Page.find(@part.more_link_page_id).path
+
   end
   
   def get_categorys

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb

@@ -30,5 +30,9 @@
 </div>  
 
 <div class="pull_right"> 
-<%= link_to t(:more_plus), "/"+@more_url %>
+<% if !params[:category_id].blank? %>
+<%= link_to t(:more_plus), panel_web_resource_front_end_web_links_path(:category_id => @part.category) %>
+<% else %>
+<%= link_to t(:more_plus), panel_web_resource_front_end_web_links_path %>
+<% end %>
 </div>