ish_manager 0.1.8.173 → 0.1.8.176
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/galleries_controller.rb +1 -1
- data/app/controllers/ish_manager/videos_controller.rb +5 -3
- data/app/views/ish_manager/galleries/index.haml +5 -5
- data/app/views/ish_manager/videos/_form.haml +29 -39
- data/app/views/ish_manager/videos/_index.haml +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 58522deb422729957e8705f7786b986c9c3704fff958e8994f43b5fe457f0e1d
|
4
|
+
data.tar.gz: 7eba2b23786a42124e52a2c0850de7f21218dadc2a4f33d2b5e34808e78ab858
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7791ca08e4f801f17aac6889b8ba1c7915e6ea6804481c3139aacafadf2550451e8a2243d71c543b6a199e60de5d8b480408058d0f473cb5016033208b18ac66
|
7
|
+
data.tar.gz: 740adb587d3aee7337fe9bcedc985e13028d77f7d122fd04a52b4c2e5cfb8ddb7a1b14bcf7c3888b1adc6f15c5ec2504a064ac48868549d1815d24a864ab565c
|
@@ -15,7 +15,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
15
15
|
@galleries = @galleries.where({ :name => /#{params[:q]}/i })
|
16
16
|
end
|
17
17
|
@galleries = @galleries.page( params[:galleries_page] ).per( 20 )
|
18
|
-
@shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
|
18
|
+
# @shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
|
19
19
|
end
|
20
20
|
|
21
21
|
end
|
@@ -58,12 +58,14 @@ class IshManager::VideosController < IshManager::ApplicationController
|
|
58
58
|
def create
|
59
59
|
@video = Video.new params[:video].permit!
|
60
60
|
@video.user_profile = current_user.profile
|
61
|
-
if params[:video][:site_id]
|
61
|
+
if !params[:video][:site_id].blank?
|
62
62
|
@video.site = Site.find params[:video][:site_id]
|
63
63
|
@video.site.touch
|
64
64
|
else
|
65
|
-
|
66
|
-
|
65
|
+
if @site
|
66
|
+
@video.site = @site
|
67
|
+
@site.touch
|
68
|
+
end
|
67
69
|
end
|
68
70
|
authorize! :create, @video
|
69
71
|
|
@@ -4,7 +4,7 @@
|
|
4
4
|
|
5
5
|
= render 'ish_manager/sites/header', :site => @site if @site
|
6
6
|
|
7
|
-
.title
|
7
|
+
.title.hide
|
8
8
|
.row
|
9
9
|
.col-sm-12.col-md-12
|
10
10
|
%h1.center Galleries
|
@@ -13,13 +13,13 @@
|
|
13
13
|
%li= link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
|
14
14
|
|
15
15
|
.row
|
16
|
-
.col-sm-12.col-md-
|
16
|
+
.col-sm-12.col-md-12
|
17
17
|
%h4 My Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
|
18
18
|
= render 'search'
|
19
19
|
- if params[:render_type] == Gallery::RENDER_TITLES
|
20
20
|
= render 'ish_manager/galleries/index_title', :galleries => @galleries, :param_name => :galleries_page
|
21
21
|
- else
|
22
22
|
= render 'ish_manager/galleries/index', :galleries => @galleries, :param_name => :galleries_page
|
23
|
-
.col-sm-12.col-md-6
|
24
|
-
|
25
|
-
|
23
|
+
-# .col-sm-12.col-md-6
|
24
|
+
-# %h4 Shared with me
|
25
|
+
-# = render 'ish_manager/galleries/index', :galleries => @shared_galleries, :param_name => :shared_galleries_page
|
@@ -1,52 +1,42 @@
|
|
1
1
|
|
2
2
|
= form_for video do |f|
|
3
|
-
|
4
3
|
= render 'form_errors', :item => @video
|
5
4
|
|
6
|
-
.field
|
7
|
-
= f.label :youtube_id
|
8
|
-
= f.text_field :youtube_id
|
9
|
-
|
10
|
-
.field
|
11
|
-
= f.label :attach
|
12
|
-
= f.file_field :video
|
13
|
-
|
14
|
-
.field
|
15
|
-
= f.label :name
|
16
|
-
= f.text_field :name
|
17
|
-
|
18
|
-
.field
|
19
|
-
= f.label :tag_id
|
20
|
-
= select :video, :tag_id, @tags_list, :selected => params[:tag_id]
|
21
|
-
|
22
|
-
.field
|
23
|
-
= f.label :city_id
|
24
|
-
= select :video, :city_id, @cities_list
|
25
|
-
|
26
|
-
.field
|
27
|
-
= f.label :site_id
|
28
|
-
= select_tag 'video[site_id]', options_for_select( @sites_list ), required: 'required'
|
29
|
-
|
30
|
-
.field
|
31
|
-
= f.label :descr
|
32
|
-
= f.text_field :descr
|
33
|
-
|
34
5
|
.row
|
35
|
-
.
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
6
|
+
.col-md-6
|
7
|
+
.field
|
8
|
+
= f.label :youtube_id
|
9
|
+
= f.text_field :youtube_id
|
10
|
+
.field
|
11
|
+
= f.label :name
|
12
|
+
= f.text_field :name
|
13
|
+
.field
|
14
|
+
= f.label :descr
|
15
|
+
= f.text_field :descr
|
16
|
+
.col-md-6
|
17
|
+
.field
|
18
|
+
= f.label :video
|
19
|
+
= f.file_field :video
|
20
|
+
.field
|
21
|
+
= f.label :thumb
|
22
|
+
= f.file_field :thumb
|
23
|
+
|
24
|
+
.field
|
25
|
+
= f.label :tag_id
|
26
|
+
= select :video, :tag_id, @tags_list, :selected => params[:tag_id]
|
27
|
+
|
28
|
+
.field
|
29
|
+
= f.label :city_id
|
30
|
+
= select :video, :city_id, @cities_list
|
31
|
+
|
42
32
|
.row
|
43
|
-
.
|
33
|
+
.col-sm-4
|
44
34
|
= f.check_box :is_public
|
45
35
|
= f.label :is_public
|
46
|
-
.
|
36
|
+
.col-sm-4
|
47
37
|
= f.check_box :is_trash
|
48
38
|
= f.label :is_trash
|
49
|
-
.
|
39
|
+
.col-sm-4
|
50
40
|
= f.check_box :is_feature
|
51
41
|
= f.label :is_feature
|
52
42
|
|
@@ -37,7 +37,7 @@
|
|
37
37
|
.inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
|
38
38
|
= link_to '[~]', edit_video_path( video )
|
39
39
|
= render 'meta', :item => video
|
40
|
-
|
40
|
+
= image_tag video.thumb.url(:thumb)
|
41
41
|
.col-xs-12.col-sm-6
|
42
42
|
.center
|
43
43
|
- if @current_user.profile.videos_embed
|
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.176
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-11-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|