ish_manager 0.1.8.161 → 0.1.8.162
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 +4 -11
- data/app/controllers/ish_manager/photos_controller.rb +2 -1
- data/app/views/ish_manager/application/_main_header_admin.haml +1 -9
- data/app/views/ish_manager/newsitems/_form.haml +27 -33
- data/app/views/ish_manager/user_profiles/index.haml +1 -7
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd2921b2b337e4fa8faf74a2c4bc703054c63b6f
|
4
|
+
data.tar.gz: 371c4708b554383a31a116d0c2dbbc771e7bb4ad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6465b4fbcf4d4846ac2bc170a264f1b79f1ef035691b0d4013c28a5027925bdbd4d92e7e9529321e017e03be582884c186cea03898c0e7b4c12899525c7b4d06
|
7
|
+
data.tar.gz: 5656e58a69dc6a91f6080c687e299d1f72be9f99a1ffbb92eb055cf44b64ab63ac2c1d4ea21d0d1996780e86ed1f5b5e810b95e810eaecdbc5034daf93826079
|
@@ -31,7 +31,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
31
31
|
@resource = Site.find params[:newsitem][:site_id] if !params[:newsitem][:site_id].blank?
|
32
32
|
@resource = Tag.find params[:tag_id] if params[:tag_id]
|
33
33
|
@resource = Tag.find params[:newsitem][:tag_id] if !params[:newsitem][:tag_id].blank?
|
34
|
-
@resource = IshModels::UserProfile.find params[:newsitem][:user_profile_id] if params[:newsitem][:user_profile_id]
|
35
34
|
@resource.newsitems << @newsitem
|
36
35
|
|
37
36
|
authorize! :create_newsitem, @resource
|
@@ -41,18 +40,14 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
41
40
|
@newsitem.photo = photo
|
42
41
|
end
|
43
42
|
|
44
|
-
|
43
|
+
case @resource.class.name
|
45
44
|
when "City"
|
46
|
-
edit_city_path( @resouce.id )
|
45
|
+
url = edit_city_path( @resouce.id )
|
47
46
|
when "Tag"
|
47
|
+
url = tag_path( @resource.id )
|
48
48
|
@resource.site.touch
|
49
|
-
tag_path( @resource.id )
|
50
49
|
when "Site"
|
51
|
-
edit_site_path( @resource.id )
|
52
|
-
when "IshModels::UserProfile"
|
53
|
-
user_profiles_path
|
54
|
-
else
|
55
|
-
root_path
|
50
|
+
url = edit_site_path( @resource.id )
|
56
51
|
end
|
57
52
|
|
58
53
|
flag = @newsitem.save && @resource.save
|
@@ -144,7 +139,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
144
139
|
def index
|
145
140
|
@resource = Site.find( params[:site_id] ) if params[:site_id]
|
146
141
|
@resource = City.find( params[:site_id] ) if params[:city_id]
|
147
|
-
|
148
142
|
authorize! :newsitems_index, @resource
|
149
143
|
@newsitems = @resource.newsitems
|
150
144
|
end
|
@@ -158,7 +152,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
|
|
158
152
|
@sites_list = Site.list
|
159
153
|
@cities_list = City.list
|
160
154
|
@tags_list = Tag.list
|
161
|
-
@user_profiles_list = IshModels::UserProfile.list
|
162
155
|
end
|
163
156
|
|
164
157
|
end
|
@@ -12,9 +12,10 @@ class IshManager::PhotosController < IshManager::ApplicationController
|
|
12
12
|
def destroy
|
13
13
|
@photo = Photo.unscoped.find params[:id]
|
14
14
|
authorize! :destroy, @photo
|
15
|
+
g = @photo.gallery
|
15
16
|
@photo.is_trash = true
|
16
17
|
@photo.save
|
17
|
-
|
18
|
+
g.touch
|
18
19
|
redirect_to request.referrer || root_path
|
19
20
|
end
|
20
21
|
|
@@ -10,32 +10,24 @@
|
|
10
10
|
%li{ :class => params[:controller] == 'ish_manager/events' ? 'active' : '' }= link_to 'Events', events_path
|
11
11
|
%li{ :class => params[:controller] == 'ish_manager/venues' ? 'active' : '' }= link_to 'Venues', venues_path
|
12
12
|
%li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles', user_profiles_path
|
13
|
-
%li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
|
14
|
-
|
13
|
+
%li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
|
15
14
|
%ul.nav.nav-pills
|
16
15
|
%li{ :class => params[:controller] == 'ish_manager/sites' ? 'active' : '' }= link_to 'Sites', sites_path
|
17
16
|
%li{ :class => params[:controller] == 'ish_manager/galleries' ? 'active' : '' }= link_to 'Galleries', galleries_path
|
18
17
|
%li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }= link_to 'Reports', reports_path
|
19
18
|
%li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
|
20
19
|
%li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
|
21
|
-
|
22
|
-
%ul.nav.nav-pills
|
23
|
-
%li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
|
24
|
-
|
25
20
|
%ul.nav.nav-pills
|
26
21
|
-# %li{ :class => params[:controller] == 'ish_manager/ally' ? 'active' : '' }= link_to 'Ally', ally_root_path
|
27
22
|
%li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
|
28
23
|
%li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
|
29
24
|
%li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
|
30
|
-
|
31
25
|
%ul.nav.nav-pills
|
32
26
|
%li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
|
33
27
|
%li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
|
34
|
-
|
35
28
|
%ul.nav.nav-pills
|
36
29
|
%li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
|
37
30
|
%li{ :class => params[:controller] == 'ish_manager/campaigns' ? 'active' : '' }= link_to 'Campaigns', campaigns_path
|
38
|
-
|
39
31
|
%ul.nav.nav-pills
|
40
32
|
%li{ :class => params[:controller] == 'ish_manager/orders' ? 'active' : '' }= link_to 'Orders', orders_path
|
41
33
|
%li{ :class => params[:controller] == 'ish_manager/co_tailors' ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path
|
@@ -1,39 +1,33 @@
|
|
1
1
|
|
2
2
|
= form_for newsitem, :html => { :multipart => true } do |f|
|
3
|
-
.
|
4
|
-
.
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
= f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
|
13
|
-
%br
|
14
|
-
= f.label :user_profile
|
15
|
-
= f.select :user_profile_id, options_for_select( @user_profiles_list )
|
3
|
+
.a
|
4
|
+
= f.label :site
|
5
|
+
= f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : nil ) )
|
6
|
+
%br
|
7
|
+
= f.label :city
|
8
|
+
= f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : nil ) )
|
9
|
+
%br
|
10
|
+
= f.label :tag
|
11
|
+
= f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
|
16
12
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
.a
|
36
|
-
|
13
|
+
.a
|
14
|
+
= f.label :name
|
15
|
+
= f.text_field :name
|
16
|
+
.a
|
17
|
+
= f.label :descr
|
18
|
+
= f.text_area :descr, :class => :tinymce
|
19
|
+
.a
|
20
|
+
= f.label :video
|
21
|
+
= f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id )
|
22
|
+
.a
|
23
|
+
= f.label :gallery
|
24
|
+
= f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id )
|
25
|
+
.a
|
26
|
+
= f.label :report
|
27
|
+
= f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
|
28
|
+
.a
|
29
|
+
= label_tag :photo
|
30
|
+
= file_field_tag :photo
|
37
31
|
.a
|
38
32
|
= f.submit :submit
|
39
33
|
|
@@ -18,16 +18,10 @@
|
|
18
18
|
%li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
|
19
19
|
%li <b>About:</b> #{profile.about}
|
20
20
|
.col-sm-8
|
21
|
-
|
21
|
+
Shared galleries:<br />
|
22
22
|
- profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
|
23
23
|
> #{link_to g.name, gallery_path(g.galleryname)} <br />
|
24
24
|
= render 'meta', :item => g
|
25
|
-
<hr />
|
26
|
-
|
27
|
-
%h5 Newsitems
|
28
|
-
- profile.newsitems.each do |n|
|
29
|
-
= render 'ish_manager/newsitems/item', n: n
|
30
|
-
<hr />
|
31
25
|
.row
|
32
26
|
Address:
|
33
27
|
= profile.addresses[0].inspect
|
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.162
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-12-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
351
351
|
version: '0'
|
352
352
|
requirements: []
|
353
353
|
rubyforge_project:
|
354
|
-
rubygems_version: 2.5.
|
354
|
+
rubygems_version: 2.5.1
|
355
355
|
signing_key:
|
356
356
|
specification_version: 4
|
357
357
|
summary: Summary of IshManager.
|