ish_manager 0.1.8.220 → 0.1.8.221
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ish_manager/application.css +0 -3
- data/app/controllers/ish_manager/galleries_controller.rb +6 -6
- data/app/controllers/ish_manager/videos_controller.rb +13 -9
- data/app/views/ish_manager/application/_search.haml +1 -1
- data/app/views/ish_manager/galleries/_menu.haml +1 -1
- data/app/views/ish_manager/videos/_index.haml +9 -13
- data/app/views/ish_manager/videos/index.haml +3 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 51f674f0353e8b9c333c9a984c39b0ffbc3a8add7548125a37b61a959d941bab
|
4
|
+
data.tar.gz: 4e00972b73af87a2adf88bd80465082952e34b42320336771ca8d5a2ad504dac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 39be779fd1aa26366ba966cef841b3d7bcc57096f6b885064322c2603a9f06c3b987577f6123936b788ff7a3a85f085d2fbe0a429ec5e8cda84a387c74778749
|
7
|
+
data.tar.gz: fe99f72254c7fd87f63768df7b825798b69c458828dbe26138b9942ae7461d9e2b63a50913d6e0801bf0da8ccd7f0e61b0602349479edb4f342c87208b3fd80b
|
@@ -1,13 +1,13 @@
|
|
1
1
|
class IshManager::GalleriesController < IshManager::ApplicationController
|
2
2
|
|
3
3
|
before_action :set_lists
|
4
|
-
|
4
|
+
|
5
5
|
def index
|
6
6
|
authorize! :index, Gallery
|
7
7
|
@galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
|
8
8
|
).order_by( :created_at => :desc )
|
9
9
|
if params[:q]
|
10
|
-
@galleries = @galleries.where({ :name => /#{params[:q]}/i })
|
10
|
+
@galleries = @galleries.where({ :name => /#{params[:q]}/i })
|
11
11
|
end
|
12
12
|
@galleries = @galleries.page( params[:galleries_page] ).per( 20 )
|
13
13
|
|
@@ -16,8 +16,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
16
16
|
|
17
17
|
def shared_with_me
|
18
18
|
authorize! :index, Gallery
|
19
|
-
@galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
|
20
|
-
).order_by( :created_at => :desc
|
19
|
+
@galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
|
20
|
+
).order_by( :created_at => :desc
|
21
21
|
).page( params[:shared_galleries_page] ).per( 10 )
|
22
22
|
render params[:render_type]
|
23
23
|
end
|
@@ -68,7 +68,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
68
68
|
|
69
69
|
# puts! params[:gallery][:shared_profiles], 'shared profiles'
|
70
70
|
if @gallery.update_attributes( params[:gallery].permit! )
|
71
|
-
new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
|
71
|
+
new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
|
72
72
|
).select { |p| !old_shared_profile_ids.include?( p.id ) }
|
73
73
|
::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
|
74
74
|
flash[:notice] = 'Success.'
|
@@ -78,7 +78,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
78
78
|
flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s
|
79
79
|
render :action => :edit
|
80
80
|
end
|
81
|
-
end
|
81
|
+
end
|
82
82
|
|
83
83
|
def show
|
84
84
|
begin
|
@@ -2,7 +2,7 @@
|
|
2
2
|
class IshManager::VideosController < IshManager::ApplicationController
|
3
3
|
|
4
4
|
before_action :set_lists
|
5
|
-
|
5
|
+
|
6
6
|
def index
|
7
7
|
authorize! :index, Video.new
|
8
8
|
@videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
|
@@ -16,12 +16,16 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
16
16
|
tag = Tag.find params[:tag_id]
|
17
17
|
@videos = @videos.where( :tag => tag )
|
18
18
|
end
|
19
|
-
|
19
|
+
|
20
20
|
if params[:site_id]
|
21
21
|
@site = Site.find params[:site_id]
|
22
22
|
@videos = @site.videos
|
23
23
|
end
|
24
|
-
|
24
|
+
|
25
|
+
if params[:q]
|
26
|
+
@videos = @videos.where({ :name => /#{params[:q]}/i })
|
27
|
+
end
|
28
|
+
|
25
29
|
@videos = @videos.page( params[:videos_page] )
|
26
30
|
|
27
31
|
respond_to do |format|
|
@@ -54,7 +58,7 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
54
58
|
@tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
|
55
59
|
@cities_list = City.list
|
56
60
|
end
|
57
|
-
|
61
|
+
|
58
62
|
def create
|
59
63
|
@video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
|
60
64
|
tags city site user_profile premium_tier premium_purchases thumb video |)
|
@@ -69,9 +73,9 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
69
73
|
end
|
70
74
|
end
|
71
75
|
authorize! :create, @video
|
72
|
-
|
76
|
+
|
73
77
|
if @video.save
|
74
|
-
flash[:notice] = 'Success'
|
78
|
+
flash[:notice] = 'Success'
|
75
79
|
redirect_to videos_path
|
76
80
|
else
|
77
81
|
flash[:alert] = 'No luck'
|
@@ -80,11 +84,11 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
80
84
|
render :action => 'new'
|
81
85
|
end
|
82
86
|
end
|
83
|
-
|
87
|
+
|
84
88
|
def edit
|
85
89
|
@video = Video.unscoped.find params[:id]
|
86
90
|
authorize! :edit, @video
|
87
|
-
|
91
|
+
|
88
92
|
@tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
|
89
93
|
@cities_list = City.list
|
90
94
|
end
|
@@ -118,5 +122,5 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
118
122
|
end
|
119
123
|
redirect_to :action => 'index'
|
120
124
|
end
|
121
|
-
|
125
|
+
|
122
126
|
end
|
@@ -3,7 +3,7 @@
|
|
3
3
|
.row
|
4
4
|
.col-sm-12.col-md-12
|
5
5
|
%h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
|
6
|
-
= render 'search'
|
6
|
+
= render 'search', path: galleries_path
|
7
7
|
%ul.menu-secondary
|
8
8
|
%li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
|
9
9
|
= link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
|
@@ -6,27 +6,23 @@
|
|
6
6
|
Videos (#{videos.count})
|
7
7
|
= link_to '[+]', new_video_path
|
8
8
|
%br
|
9
|
-
|
9
|
+
|
10
10
|
= paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
|
11
|
-
|
11
|
+
|
12
12
|
- videos.each do |video|
|
13
13
|
.panel
|
14
14
|
.panel-content
|
15
15
|
.row
|
16
|
-
.col-
|
17
|
-
.
|
16
|
+
.col-sm-6
|
17
|
+
.float-left
|
18
|
+
.thumb= image_tag video.thumb.url(:thumb)
|
19
|
+
.a
|
18
20
|
= link_to video.name, video_path( video )
|
19
21
|
.inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
|
20
22
|
= link_to '[~]', edit_video_path( video )
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
.center
|
25
|
-
- if @current_user.profile.videos_embed
|
26
|
-
= render 'ish_manager/videos/embed', :video => video
|
27
|
-
- else
|
28
|
-
= render 'ish_manager/videos/preview', :video => video
|
29
|
-
|
23
|
+
= render 'meta', :item => video
|
24
|
+
.c
|
25
|
+
|
30
26
|
= paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
|
31
27
|
%hr
|
32
28
|
|