fixed page setting select all bug

app/assets/javascripts/lib/items/items.js.erb

@@ -193,6 +193,7 @@ function pageSetting(id, edit, ps) {
                   $hiddenInput = $pageCategory.siblings('input[type="hidden"]');
               _selectData.module.category.length ? $hiddenInput.removeAttr('name') : $hiddenInput.attr('name', 'page[category][]');
               _selectData.module.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+              console.log($hiddenInput, _selectData.module.category)
             });
             $pageCategoryGroup.show();
           }

app/views/admin/items/_node.html.erb

@@ -16,9 +16,8 @@
       <% else %>
         <%= link_to node.title, node.url %>
       <% end %>
-
       <div class="item-menu">
-        <%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view), data: {title: node.title} if node.class.to_s.eql?('Page') %>
+        <%= link_to content_tag(:i, nil, class: "icon-eye-open"), "/#{node.path}?edit=true", class: "view-page open-slide tip", title: t(:view), data: {title: node.title} if node.class.to_s.eql?('Page') %>
         <% if node.class.to_s.downcase.eql?("page") %>
           <%= link_to content_tag(:i, nil, class: "icon-edit"), "#page", class: "open-slide tip page edit", title: t('editing.page'), data: {title: t('editing.page'), id: node.id.to_s, parent: node.parent_id.to_s, form: {name: node.name}.merge(node.title_translations)} %>
         <% elsif node.class.to_s.downcase.eql?("link") %>

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -9,30 +9,19 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def search_result
-    if params[:search_query] == ""
-      @bulletins = get_bulletins_for_index
-      
-    else
       @search = Bulletin.solr_search do 
         fulltext params[:search_query]
         with(:frontend_search,true)
         with(:available_lang).any_of([I18n.locale.to_s])
       end
-      # @bulletins = Bulletin.where(:category_id.in => params[:category_id]).and(:is_rejected=>false).and(:is_pending=>false)
+
       search_result =  @search.results.collect{|result| result.id}
 
       @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
-    end
   end
 
   def index
-
-   end
-
-   def get_bulletins_for_index
-    
-      @item = Page.find(params[:page_id]) rescue nil
-      
+    @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
         @page_num = @item.frontend_data_count
@@ -41,24 +30,33 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       end
       @frontend_style = @item.frontend_style
     end
-       
+    @item = Page.find(params[:page_id]) rescue nil
+    if  !params[:search_query].blank?
+      @search = Bulletin.solr_search do 
+        fulltext params[:search_query]
+        with(:frontend_search,true)
+        with(:available_lang).any_of([I18n.locale.to_s])
+      end
+      search_result =  @search.results.collect{|result| result.id}
+
+      @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
+    else
       date_now = Time.now
       if !params[:category_id].blank? && !params[:tag_id].blank?
-        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
-        # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in=>params[:category_id],:tagged_ids.in=>params[:tag_id])
+        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id], :tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
-        debugger        
       elsif !params[:category_id].blank?
-        @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
+        @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:tag_id].blank?
-        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
+        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
       else
         @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
       end
       # delayed_impressionist(@tag) if @tag
-      @bulletins
-   end 
+    end
+
+  end 
   
   def show
     @item = Page.find(params[:page_id]) rescue nil

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -39,7 +39,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
       @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
     end
 
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
     
   end
   
@@ -62,7 +62,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
       @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num )
     end
 
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
     
   end
   
@@ -139,7 +139,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
 
   def bulletins_side_bar
     @tags_and_class = @module_app.sorted_tags_for_cloud
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
   end
   
   def bulletins_search_block

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

@@ -1,6 +1,7 @@
 <% # encoding: utf-8 %>
 
 <%= flash_messages %>
+
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 	<table class="table table-bordered">

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb

@@ -1,6 +1,7 @@
 <% # encoding: utf-8 %>
 
 <%= flash_messages %>
+
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 	<table class="table table-bordered">
@@ -22,7 +23,7 @@
 	<% @bulletins.each do |post| %>
 	  <tr>
 		<td><%= post.bulletin_category.title rescue nil %></td>
-		<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.category_id) %>
+		<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 		<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 		</td>
 		<td><%= display_date_time(post.postdate) %></td>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb

@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag "default_widget" %>
-<script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.js'></script>
-<!-- <script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.degsin.js'></script> -->
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.js'></script>
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script>
 
 <div id="bulletin_widget">
 	<%= render 'index' %>

vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb

@@ -213,7 +213,7 @@ var galleryAPI = function(){
 		}
 		
 		var preparestage = function(albumid){
-			$.getJSON("/panel/gallery/front_end/albums/"+albumid+"/imgs",{"inner":true},function(album){
+			$.getJSON("panel/gallery/front_end/albums/"+albumid+"/imgs",{"inner":true},function(album){
 				imageArray = eval(album.images);
 				$.each(album.images,function(i,image){
 					if(image._id == id)