ish_manager 0.1.8.166 → 0.1.8.171

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 72a54053a25ad57f6d3c6ae8dca292a2e8b357ba97b2cd5ed05c9c4bd42e39eb
4
- data.tar.gz: 7bac058a89ecf823a351ccfb8dceaf1c459d2fb025c134f523bfc10fe47108f8
3
+ metadata.gz: 972714dc4a1aff7b023b2ee15c876d8028f4d4719390534997dde56ba1626cc5
4
+ data.tar.gz: 52889cc54775efe5a7e6f9290652f8afee5e71b8c4333d261db90c79337a8583
5
5
  SHA512:
6
- metadata.gz: 3d557d5b345b5b1fbc4145219bd253d8ad5efa0642af7f1ba6c074f0911c0dc1a28a4f8a16312d6adcb5750f3f9ec97815b6730f3aaf2cb155094a88144d6fa4
7
- data.tar.gz: 3a3ab2d204ff0c303d1cb4c308c51c4c7ff6098b811458751788640591b2125e919d7293dc45aa4d77dd8603af03b98afc32f9f396653f1859a1ec1dc6d56389
6
+ metadata.gz: a699f6ef48a3c9314f2b9f0bd868a0cf31bebd3ddc74e023808a97e0ca14fcbf34f3e1a9590ad00a93c0bac4dd3b269ade904da9aa63b4b90a99ee025b28faac
7
+ data.tar.gz: a606357233c811af9bb09eaaa1d754430d89cc279459d6e438f9586f563efe56825bda9080be58eeaea08fb4d06bdb16f0840eac8265caf49a402abf6a4a44bd
@@ -25,12 +25,13 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
25
25
 
26
26
  def create
27
27
  @newsitem = Newsitem.new params[:newsitem].permit!
28
- @resource = City.find params[:city_id] if params[:city_id]
29
- @resource = City.find params[:newsitem][:city_id] if !params[:newsitem][:city_id].blank?
30
- @resource = Site.find params[:site_id] if params[:site_id]
31
- @resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
32
- @resource = Tag.find params[:tag_id] if params[:tag_id]
33
- @resource = Tag.find params[:newsitem][:tag_id] if !params[:newsitem][:tag_id].blank?
28
+ @resource = City.find params[:city_id] if params[:city_id]
29
+ @resource = City.find params[:newsitem][:city_id] if !params[:newsitem][:city_id].blank?
30
+ @resource = Site.find params[:site_id] if params[:site_id]
31
+ @resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
32
+ @resource = Tag.find params[:tag_id] if params[:tag_id]
33
+ @resource = Tag.find params[:newsitem][:tag_id] if !params[:newsitem][:tag_id].blank?
34
+
34
35
  @resource = IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
35
36
  @resource.newsitems << @newsitem
36
37
 
@@ -37,12 +37,13 @@
37
37
  -# .subhead= n.descr
38
38
  .c
39
39
 
40
- - if !n.video.blank?
40
+ - if n.video_id
41
+ - video = Video.unscoped.find n.video_id
41
42
  .Nvideo
42
- %h3
43
- = link_to (n.video.name.blank? ? t('videos.no_title') : n.video.name), video_path(n.video.youtube_id)
44
- = render 'ish_manager/application/meta', :item => n.video
45
- = render 'ish_manager/videos/embed_half', :video => n.video
43
+ = link_to video.video.url, video.video.url
44
+ -# %h3= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path(video.youtube_id)
45
+ = render 'ish_manager/application/meta', :item => video
46
+ = render 'ish_manager/videos/embed_half', :video => video
46
47
  .c
47
48
 
48
49
  - if !n.descr.blank? && n.gallery.blank? && n.report.blank?
@@ -7,6 +7,10 @@
7
7
  = f.label :youtube_id
8
8
  = f.text_field :youtube_id
9
9
 
10
+ .field
11
+ = f.label :attach
12
+ = f.file_field :video
13
+
10
14
  .field
11
15
  = f.label :name
12
16
  = f.text_field :name
@@ -21,7 +25,7 @@
21
25
 
22
26
  .field
23
27
  = f.label :site_id
24
- = select_tag 'video[site_id]', options_for_select( @sites_list )
28
+ = select_tag 'video[site_id]', options_for_select( @sites_list ), required: 'required'
25
29
 
26
30
  .field
27
31
  = f.label :descr
@@ -12,5 +12,7 @@
12
12
  = @video.name
13
13
  = render 'ish_manager/application/meta', :item => @video
14
14
  .text-center= render 'embed', :video => @video
15
+ %hr
16
+ = link_to @video.video.url, @video.video.url
15
17
 
16
18
  -# = render 'disqus'
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.166
4
+ version: 0.1.8.171
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-14 00:00:00.000000000 Z
11
+ date: 2019-04-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails