From 1279af0c113920bbb669503597cf9e4f5e3c87b8 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 21 Nov 2012 11:46:06 +0800
Subject: [PATCH] fix and hide for visitors,except for album

---
 .../admin/users_new_interface_controller.rb    | 10 +++++++---
 .../admin/users_new_interface/_filter.html.erb |  6 ++++--
 .../_index_paginator.html.erb                  |  2 ++
 .../_user_for_listing.html.erb                 |  2 +-
 .../admin/users_new_interface/show.html.erb    |  2 +-
 app/views/layouts/_guest_orbit_menu.erb        |  5 +++++
 app/views/layouts/_member_orbit_menu.erb       | 15 +++++++++++++++
 app/views/layouts/_orbit_bar.html.erb          | 18 ++----------------
 app/views/layouts/_side_bar_content.html.erb   | 10 +++++-----
 config/mongoid.yml                             |  2 +-
 .../back_end/archive_files_controller.rb       |  6 +++---
 .../archive_files/_archive_files.html.erb      |  2 ++
 .../panel/calendar/back_end/cals_controller.rb |  6 +++++-
 .../calendar/back_end/cals/index.html.erb      |  2 ++
 .../gprs/back_end/locations_controller.rb      |  2 +-
 .../gprs/back_end/locations/index.html.erb     | 16 +++++++++++-----
 16 files changed, 67 insertions(+), 39 deletions(-)
 create mode 100644 app/views/layouts/_guest_orbit_menu.erb
 create mode 100644 app/views/layouts/_member_orbit_menu.erb

diff --git a/app/controllers/admin/users_new_interface_controller.rb b/app/controllers/admin/users_new_interface_controller.rb
index 8c5ec93a..69c22ed6 100644
--- a/app/controllers/admin/users_new_interface_controller.rb
+++ b/app/controllers/admin/users_new_interface_controller.rb
@@ -1,9 +1,13 @@
-class Admin::UsersNewInterfaceController < ApplicationController
+class Admin::UsersNewInterfaceController <  OrbitBackendController
   
   layout "new_admin"
-  before_filter :authenticate_user!
-  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
+  # before_filter :authenticate_user!
+  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
   
+  before_filter :force_order_for_visitor,:only=>[:index,:show]
+  before_filter :force_order_for_user,:except => [:index,:show]
+  before_filter :for_app_sub_manager,:except => [:index,:show]
+
   def index
     get_tags
     get_sub_roles
diff --git a/app/views/admin/users_new_interface/_filter.html.erb b/app/views/admin/users_new_interface/_filter.html.erb
index 3262ea5d..4033ff5e 100644
--- a/app/views/admin/users_new_interface/_filter.html.erb
+++ b/app/views/admin/users_new_interface/_filter.html.erb
@@ -61,8 +61,10 @@
                             <thead>
                                 <tr>
                                     <th class="span1">
-                                        <input type="checkbox">
-                                        <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                        <% if is_admin? %>
+                                            <input type="checkbox">
+                                            <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                        <%end%>
                                     </th>
                                 <th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
                                 <th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
diff --git a/app/views/admin/users_new_interface/_index_paginator.html.erb b/app/views/admin/users_new_interface/_index_paginator.html.erb
index 04fff093..3d8864d0 100644
--- a/app/views/admin/users_new_interface/_index_paginator.html.erb
+++ b/app/views/admin/users_new_interface/_index_paginator.html.erb
@@ -1,7 +1,9 @@
        <div class="form-actions form-fixed pagination-right">
+          <% if is_admin? %>
             <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
                 <i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
             <% end -%>
+          <%end -%>
             <div class="paginationFixed" id="user_pagination">
                <%= paginate @users, :params => {:inner => false}%>
             </div>
diff --git a/app/views/admin/users_new_interface/_user_for_listing.html.erb b/app/views/admin/users_new_interface/_user_for_listing.html.erb
index 9df1eb10..e7fe44ee 100644
--- a/app/views/admin/users_new_interface/_user_for_listing.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_listing.html.erb
@@ -1,5 +1,5 @@
                 <tr class="with_action">
-                    <td class="span1"><input type="checkbox"></td>
+                    <td class="span1"><% if is_admin? %><input type="checkbox"><% end%></td>
                     <td class="span3">
                         <div class="label-group">
                             <div class="label-td"><!-- 
diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb
index b064986b..a5813fff 100644
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/app/views/admin/users_new_interface/show.html.erb
@@ -38,7 +38,7 @@
                 <p class="user-mail">
                     <%= @user.email %>
                 </p>
-                <%= link_to "<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small"%>
+                <%= link_to("<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
             </div>
             <div class="user-roles my_scroll">
                 <div class="scrollbar">
diff --git a/app/views/layouts/_guest_orbit_menu.erb b/app/views/layouts/_guest_orbit_menu.erb
new file mode 100644
index 00000000..606cf5fd
--- /dev/null
+++ b/app/views/layouts/_guest_orbit_menu.erb
@@ -0,0 +1,5 @@
+          <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
+          <ul class="dropdown-menu">
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
+          </ul>
\ No newline at end of file
diff --git a/app/views/layouts/_member_orbit_menu.erb b/app/views/layouts/_member_orbit_menu.erb
new file mode 100644
index 00000000..1ec88b3f
--- /dev/null
+++ b/app/views/layouts/_member_orbit_menu.erb
@@ -0,0 +1,15 @@
+          <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
+          <ul class="dropdown-menu">
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
+
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
+              <%if (is_admin? rescue false)%>
+              <li class="divider"></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
+              <% end -%>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
+          </ul>
\ No newline at end of file
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index 4733ab6f..b3967885 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -3,23 +3,9 @@
 		<div class="container clear">
 			<div class="dropdown orbit-logo pull-left">
 			    <% if !current_user.nil?  %>
-			    <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
-			    <ul class="dropdown-menu">
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
-
-			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
-							<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>
-							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
-							<%if (is_admin? rescue false)%>
-			        <li class="divider"></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
-							<% end -%>
-			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
-			    </ul>
+			    		<%= render :partial=>"layouts/member_orbit_menu"%>
 			    <% else %>
-			    	<a class="brand dropdown-toggle" data-toggle="dropdown" href="/">Orbit</a>
+			    		<%= render :partial=>"layouts/guest_orbit_menu"%>
 			    <% end -%>
 			</div>
 			<ul class="nav">
diff --git a/app/views/layouts/_side_bar_content.html.erb b/app/views/layouts/_side_bar_content.html.erb
index e9da4cf0..a14465ab 100644
--- a/app/views/layouts/_side_bar_content.html.erb
+++ b/app/views/layouts/_side_bar_content.html.erb
@@ -9,7 +9,7 @@
 <%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
-    <%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
+    <%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") )if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index')if (is_manager? rescue nil) %>
@@ -23,7 +23,7 @@
 <%= content_tag :li, :class =>( active_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')||  active_for_app_auth('news') || active_for_ob_auths_object("NewsBulletinCategory")) do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.news')), panel_news_back_end_news_bulletins_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals')) do -%>
-    <%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') %>
+    <%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_news_bulletins_path), :class => active_for_action('news_bulletins', 'index') if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_news_back_end_news_bulletin_path), :class => active_for_action('news_bulletins', 'new') if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') if (is_manager? rescue nil)%>
@@ -61,7 +61,7 @@
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') || active_for_app_auth('web_resource')  || active_for_ob_auths_object("WebLinkCategory")  do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.link')), panel_web_resource_back_end_web_links_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
-    <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index') %>
+    <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
@@ -84,7 +84,7 @@
 <%= content_tag :li, :class => active_for_controllers('archive_files', 'panel/archive/back_end/tags', 'archive_file_categorys') do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-asset') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
-    <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
+    <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('admin.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new')  if (is_admin? rescue nil)%>
     <%= content_tag(:li, link_to((t('admin.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index'))if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('admin.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil)%>
@@ -97,7 +97,7 @@
     <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%= content_tag :li, link_to((t('admin.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_calendar_back_end_cal_path), :class => active_for_action('cals','new') %>
+  <%= content_tag :li, link_to((t('admin.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_calendar_back_end_cal_path), :class => active_for_action('cals','new') if (is_manager? rescue nil)%>
   <%= content_tag :li, link_to(t('admin.tags'), panel_calendar_back_end_tags_path), :class => active_for_action('/panel/calendar/back_end/tags', 'index')if (is_manager? rescue nil) %>
   <%#= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
   <% end -%>
diff --git a/config/mongoid.yml b/config/mongoid.yml
index a809bc06..75c5ef80 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -2,7 +2,7 @@ defaults: &defaults
   host: localhost
   # slaves:
   #   - host: slave1.local
-  port: 27017
+  port: 37017
   #   - host: slave2.local
   #     port: 27019
 
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
index 0336c11b..3d3a6b21 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
@@ -1,7 +1,7 @@
 class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
-  
-  before_filter :authenticate_user!
-  before_filter :is_admin?
+  before_filter :force_order_for_visitor,:only=>[:index]
+  before_filter :force_order_for_user,:except => [:index]
+  before_filter :for_app_sub_manager,:except => [:index]
 
   def index
   
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb
index 7f540486..36d57f4e 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb
@@ -10,12 +10,14 @@
 		<% if post.is_hidden? %>
 			<span class="label"><%= t(:hidden) %></span>
 		<% end %>	
+		<% if is_manager?%>
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<li><%= link_to t('archive_file.edit'), edit_panel_archive_back_end_archive_file_path(post) %></li>
 				<li><%= link_to t('archive_file.delete'), panel_archive_back_end_archive_file_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			</ul>
 		</div>
+		<%end%>
 	</td>
 	<td><%= post.archive_file_category.title %></td>
 	<td>
diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
index 9a414378..960ac2d7 100644
--- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
+++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
@@ -1,7 +1,11 @@
 class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 	include AdminHelper
 	include Panel::Calendar::BackEnd::CalsHelper
-	before_filter :force_order_for_user
+
+	before_filter :force_order_for_visitor,:except=>[:new,:edit,:update,:create,:destroy]
+	before_filter :force_order_for_user,:only => [:new,:edit,:update,:create,:destroy]
+	before_filter :for_app_sub_manager,:only => [:new,:edit,:update,:create,:destroy]
+
 	def index
 		@calendars = Cal.all
 	end
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
index eea0e647..f5491db9 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
@@ -58,6 +58,7 @@
 	</div>
 	<div id="view_holder"></div>
 </div>
+<% if is_manager? %>
 <div class="form-actions form-fixed">
 	<div class="row-fluid">
 		<div class="span8">
@@ -67,6 +68,7 @@
 		</div>
 	</div>
 </div>
+<%end%>
 <div id="event_create" class="modal" style="right: 8px; bottom: 50px; left: auto; top: auto; width: 380px; margin: 0;display:none;"></div>
 
 <div id="event_quick_view" class="modal" style="width: 300px; display:none; margin:0 0 0 0;"></div>
diff --git a/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb b/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
index 8609cce1..1ba13703 100644
--- a/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
+++ b/vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
@@ -3,7 +3,7 @@ class Panel::Gprs::BackEnd::LocationsController < OrbitBackendController
   #before_filter :clean_values, :only => [:create, :update]
 
   before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :delete]
-  before_filter :force_order_for_user,:except => :get_locations
+  before_filter :force_order_for_user,:except => [:get_locations,:index]
   #before_filter :for_app_sub_manager,:except => [:index, :new, :edit, :delete, :get_locations]
 
   def index
diff --git a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
index eb8b0485..95b72b73 100644
--- a/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
+++ b/vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
@@ -6,8 +6,10 @@
       <th class="span1"><%= t('location.longitude') %></th>
       <th class="span1"><%= t('location.latitude') %></th>
       <th class="span3"><%= t('location.description') %></th>
-      <th class="span1"><%= t('location.edit') %></th>
-      <th class="span1"><%= t('location.delete') %></th>
+      <%if is_manager? %>
+        <th class="span1"><%= t('location.edit') %></th>
+        <th class="span1"><%= t('location.delete') %></th>
+      <% end %>
     </tr>
   </thead>
   <tbody id="tbody_locations" class="sort-holder">
@@ -18,11 +20,15 @@
         <td><%= location.longitude%></td>
         <td><%= location.latitude%></td>
         <td><%= location.description%></td>
-        <td><%= link_to 'Edit', edit_panel_gprs_back_end_location_path(location) %></td>
-        <td><%= link_to 'Destroy', panel_gprs_back_end_location_path(location), method: :delete , :confirm => t(:sure?) %></td>
+        <%if is_manager? %>
+          <td><%= link_to 'Edit', edit_panel_gprs_back_end_location_path(location) %></td>
+          <td><%= link_to 'Destroy', panel_gprs_back_end_location_path(location), method: :delete , :confirm => t(:sure?) %></td>  
+        <%end%>
+        
       </tr>
     <% end %>
   </tbody>
 </table>
-
+<%if is_manager? %>
 <td><%= link_to 'New', new_panel_gprs_back_end_location_path %></td>
+<% end %>
\ No newline at end of file