ish_manager 0.1.8.26 → 0.1.8.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/newsitems_controller.rb +12 -10
- data/app/controllers/ish_manager/videos_controller.rb +4 -1
- data/app/views/ish_manager/newsitems/_form.haml +14 -8
- data/app/views/ish_manager/newsitems/_index.haml +1 -1
- data/app/views/ish_manager/newsitems/edit.haml +6 -4
- data/app/views/ish_manager/newsitems/new.haml +2 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 54f465ac13fcfc2028cf6d3e46411ef9b73ccfbb
|
4
|
+
data.tar.gz: 2f1443216d52b63319250dc217cdaaed9ff76e66
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8726ef4ea29cba82e10c716d4d75d2bf32f62b899108ca998a82dd0f1c6aa2a3dbefa382087ad94c1c33d156daa34851e3eea0620c45298c7de1f039de71e5ea
|
7
|
+
data.tar.gz: c159b2cd8593e9dbf58d576d80d8bee1ca7baec3c3a020516ad63c05f7aa0311b569e55528f531c23584acb756846d93b099fb15db2e4469d39a81215185f80c
|
@@ -1,6 +1,8 @@
|
|
1
1
|
|
2
2
|
class IshManager::NewsitemsController < IshManager::ApplicationController
|
3
3
|
|
4
|
+
before_action :set_lists
|
5
|
+
|
4
6
|
def new
|
5
7
|
@newsitem = Newsitem.new
|
6
8
|
if params[:city_id]
|
@@ -11,14 +13,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
11
13
|
@site = Site.find params[:site_id]
|
12
14
|
@newsitem.site = @site
|
13
15
|
end
|
16
|
+
authorize! :new, @newsitem
|
14
17
|
end
|
15
18
|
|
16
19
|
def create
|
17
20
|
n = Newsitem.new params[:newsitem].permit!
|
18
|
-
|
19
|
-
n.gallery = Gallery.find params[:newsitem][:gallery_id] unless params[:newsitem][:gallery_id].blank?
|
20
|
-
n.photo = Photo.find params[:newsitem][:photo_id] unless params[:newsitem][:photo_id].blank?
|
21
|
-
n.descr = params[:newsitem][:descr]
|
21
|
+
authorize! :create, n
|
22
22
|
|
23
23
|
if params[:city_id]
|
24
24
|
@city = City.find params[:city_id]
|
@@ -51,12 +51,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
54
|
-
def show
|
55
|
-
end
|
56
|
-
|
57
|
-
def index
|
58
|
-
end
|
59
|
-
|
60
54
|
def destroy
|
61
55
|
authorize! :destroy, Newsitem
|
62
56
|
if params[:city_id]
|
@@ -85,6 +79,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
85
79
|
@newsitem = @city.newsitems.find params[:id]
|
86
80
|
url = edit_city_path( @city )
|
87
81
|
end
|
82
|
+
authorize! :update, @newsitem
|
88
83
|
flag = @newsitem.update_attributes params[:newsitem].permit!
|
89
84
|
|
90
85
|
if flag
|
@@ -105,6 +100,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
105
100
|
@city = City.find params[:city_id]
|
106
101
|
@newsitem = @city.newsitems.find( params[:id] )
|
107
102
|
end
|
103
|
+
authorize! :edit, @newsitem
|
104
|
+
end
|
105
|
+
|
106
|
+
private
|
107
|
+
|
108
|
+
def set_lists
|
109
|
+
@videos_list = Video.list
|
108
110
|
end
|
109
111
|
|
110
112
|
end
|
@@ -5,7 +5,7 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
5
5
|
|
6
6
|
def index
|
7
7
|
authorize! :index, Video.new
|
8
|
-
@videos = Video.all
|
8
|
+
@videos = Video.unscoped.all
|
9
9
|
|
10
10
|
if params[:city_id]
|
11
11
|
city = City.find params[:city_id]
|
@@ -55,8 +55,10 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
55
55
|
@video.user = current_user
|
56
56
|
if params[:video][:site_id]
|
57
57
|
@video.site = Site.find params[:video][:site_id]
|
58
|
+
@video.site.touch
|
58
59
|
else
|
59
60
|
@video.site = @site
|
61
|
+
@site.touch
|
60
62
|
end
|
61
63
|
authorize! :create, @video
|
62
64
|
|
@@ -85,6 +87,7 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
85
87
|
|
86
88
|
@video.update params[:video].permit!
|
87
89
|
if @video.save
|
90
|
+
@video.site.touch if @video.site
|
88
91
|
flash[:notice] = 'Success.'
|
89
92
|
redirect_to videos_path
|
90
93
|
else
|
@@ -1,10 +1,16 @@
|
|
1
1
|
|
2
|
-
= form_for
|
3
|
-
=
|
4
|
-
=
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
2
|
+
= form_for newsitem do |f|
|
3
|
+
= hidden_field_tag :site_id, @site.id if @site
|
4
|
+
= hidden_field_tag :city_id, @city.id if @city
|
5
|
+
.a
|
6
|
+
= f.label :name
|
7
|
+
= f.text_field :name
|
8
|
+
.a
|
9
|
+
= f.label :descr
|
10
|
+
= f.text_area :descr, :class => :tinymce
|
11
|
+
.a
|
12
|
+
= f.label :video
|
13
|
+
= f.select :video_id, options_for_select( @videos_list )
|
14
|
+
.a
|
15
|
+
= f.submit :submit
|
10
16
|
|
@@ -11,7 +11,7 @@
|
|
11
11
|
.manager-newsitems--index
|
12
12
|
.row
|
13
13
|
.col-sm-12
|
14
|
-
%h2 Newsitems (#{newsitems.count})
|
14
|
+
%h2 Newsitems (#{newsitems.count}) #{link_to '[+]', new_site_newsitem_path( site.id )}
|
15
15
|
= paginate newsitems, :param_name => 'newsitems_page'
|
16
16
|
%ol
|
17
17
|
- newsitems.each do |n|
|
@@ -1,14 +1,16 @@
|
|
1
1
|
|
2
2
|
- if defined? @city
|
3
|
-
- url =
|
3
|
+
- url = city_newsitem_path( @city, @newsitem ) if @city
|
4
4
|
- if defined? @site
|
5
|
-
- url =
|
5
|
+
- url = site_newsitem_path( @site, @newsitem ) if @site
|
6
6
|
|
7
7
|
.row
|
8
8
|
.small-12.columns
|
9
9
|
%h1 Edit this newsitem
|
10
|
-
|
11
|
-
|
10
|
+
- if @site
|
11
|
+
For site: #{@site.domain} #{@site.lang} <br />
|
12
|
+
- if @city
|
13
|
+
For city: #{@city.name} <br />
|
12
14
|
id: #{@newsitem.id}
|
13
15
|
|
14
16
|
= render 'form', :newsitem => @newsitem, :url => url
|
@@ -1,9 +1,4 @@
|
|
1
1
|
|
2
|
-
- if @city
|
3
|
-
- url = manager_city_newsitems_path( :city_id => @city.id )
|
4
|
-
- if @site
|
5
|
-
- url = manager_site_newsitems_path( :site_id => @site.id )
|
6
|
-
|
7
2
|
.row
|
8
3
|
.small-12.columns
|
9
4
|
%h1
|
@@ -12,5 +7,5 @@
|
|
12
7
|
For Site #{@site.domain}
|
13
8
|
- if @city
|
14
9
|
For City #{@city.name}
|
15
|
-
= render 'form', :newsitem => @newsitem
|
16
|
-
|
10
|
+
= render 'form', :newsitem => @newsitem
|
11
|
+
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ish_manager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.8.
|
4
|
+
version: 0.1.8.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-07-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|