aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/access_points_controller.rb
diff options
context:
space:
mode:
authorVlatka Pavisic2017-02-06 11:42:12 +0100
committerVlatka Pavisic2017-02-07 11:25:29 +0100
commitd94b1271d147fdb5bbd1e616e116173198e858db (patch)
treee1b5631e72e009ffd80fdf4e47159b2b11cd899e /app/controllers/access_points_controller.rb
parent9c3095c20aaef122212ed71ce8818e3a18b13308 (diff)
downloadchouette-core-d94b1271d147fdb5bbd1e616e116173198e858db.tar.bz2
Refs #2476 : Disable modification and deletion of resources from another referential; in progress
Diffstat (limited to 'app/controllers/access_points_controller.rb')
-rw-r--r--app/controllers/access_points_controller.rb17
1 files changed, 9 insertions, 8 deletions
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index 534b0c835..2cef90a28 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -7,7 +7,9 @@ class AccessPointsController < ChouetteController
respond_to :html, :kml, :xml, :json
- def index
+ include PolicyChecker
+
+ def index
request.format.kml? ? @per_page = nil : @per_page = 12
index! do |format|
@@ -16,7 +18,7 @@ class AccessPointsController < ChouetteController
redirect_to params.merge(:page => 1)
end
}
- end
+ end
end
def show
@@ -26,14 +28,14 @@ class AccessPointsController < ChouetteController
show! do |format|
unless access_point.position or params[:default]
format.kml {
- render :nothing => true, :status => :not_found
+ render :nothing => true, :status => :not_found
}
-
+
end
format.html {build_breadcrumb :show}
end
end
-
+
def edit
access_point.position ||= access_point.default_position
@@ -45,7 +47,7 @@ class AccessPointsController < ChouetteController
protected
-
+
alias_method :access_point, :resource
def map
@@ -54,7 +56,7 @@ class AccessPointsController < ChouetteController
def collection
@q = parent.access_points.search(params[:q])
- @access_points ||=
+ @access_points ||=
begin
access_points = @q.result(:distinct => true).order(:name)
access_points = access_points.paginate(:page => params[:page]) if @per_page.present?
@@ -62,7 +64,6 @@ class AccessPointsController < ChouetteController
end
end
-
private
def access_point_params