spud_core 0.4.0 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.markdown +1 -1
- data/app/controllers/spud/admin/users_controller.rb +6 -12
- data/app/controllers/spud/sitemaps_controller.rb +2 -0
- data/app/models/spud_user.rb +5 -0
- data/app/views/spud/admin/users/edit.html.erb +3 -0
- data/app/views/spud/admin/users/new.html.erb +3 -0
- data/app/views/spud/admin/users/show.html.erb +0 -5
- metadata +18 -18
- data/app/controllers/spud/admin/settings_controller.rb +0 -15
- data/app/models/spud_setting.rb +0 -2
data/README.markdown
CHANGED
@@ -8,7 +8,7 @@ Installation/Usage
|
|
8
8
|
|
9
9
|
1. In your Gemfile add the following
|
10
10
|
|
11
|
-
gem '
|
11
|
+
gem 'spud_core', :git => "git://github.com/davydotcom/spud_core_admin.git"
|
12
12
|
|
13
13
|
2. Run bundle install
|
14
14
|
3. Copy in database migrations to your new rails project
|
@@ -3,19 +3,19 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
|
|
3
3
|
belongs_to_spud_app :users
|
4
4
|
add_breadcrumb "Users", :spud_admin_users_path
|
5
5
|
|
6
|
-
# filters
|
6
|
+
# filters
|
7
7
|
before_filter :load_user,:only => [:edit,:update,:show,:destroy]
|
8
8
|
|
9
9
|
def index
|
10
10
|
@users = SpudUser.order(:login).paginate :page => params[:page]
|
11
11
|
respond_with @users
|
12
|
-
|
13
12
|
end
|
14
13
|
|
15
14
|
def show
|
16
|
-
|
17
|
-
|
15
|
+
add_breadcrumb @user.full_name, :spud_admin_user_path
|
16
|
+
respond_with @user
|
18
17
|
end
|
18
|
+
|
19
19
|
def new
|
20
20
|
@user = SpudUser.new
|
21
21
|
Spud::Core.admin_applications.each do |application|
|
@@ -24,8 +24,6 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
|
|
24
24
|
respond_with @user do |format|
|
25
25
|
format.js { render :partial => "new"}
|
26
26
|
end
|
27
|
-
|
28
|
-
|
29
27
|
end
|
30
28
|
|
31
29
|
def create
|
@@ -36,14 +34,12 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
|
|
36
34
|
if @user.save
|
37
35
|
status = 200
|
38
36
|
flash[:notice] = "User created successfully"
|
39
|
-
|
40
37
|
else
|
41
38
|
flash[:error] = "There was an error while saving the user."
|
42
|
-
render :action => "new"
|
43
39
|
end
|
44
40
|
|
45
|
-
|
46
|
-
format.js { render :status => status, :json => @user.to_json}
|
41
|
+
respond_with @user,:location => spud_admin_users_url do |format|
|
42
|
+
format.js { render :status => status, :json => @user.to_json }
|
47
43
|
format.html {
|
48
44
|
if status == 200
|
49
45
|
redirect_to spud_admin_users_url()
|
@@ -54,7 +50,6 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
|
|
54
50
|
end
|
55
51
|
end
|
56
52
|
|
57
|
-
|
58
53
|
def edit
|
59
54
|
Spud::Core.admin_applications.each do |application|
|
60
55
|
permission = @user.spud_admin_permissions.select {|perm| perm.name == application[:name]}
|
@@ -94,7 +89,6 @@ class Spud::Admin::UsersController < Spud::Admin::ApplicationController
|
|
94
89
|
format.js { render :text => nil,:status => status }
|
95
90
|
format.html {redirect_to spud_admin_users_url()}
|
96
91
|
end
|
97
|
-
|
98
92
|
end
|
99
93
|
|
100
94
|
private
|
data/app/models/spud_user.rb
CHANGED
@@ -11,6 +11,11 @@ class SpudUser < ActiveRecord::Base
|
|
11
11
|
if first_name.blank? && last_name.blank?
|
12
12
|
return self.login
|
13
13
|
end
|
14
|
+
if self.first_name.blank?
|
15
|
+
return self.last_name
|
16
|
+
elsif self.last_name.blank?
|
17
|
+
return self.first_name
|
18
|
+
end
|
14
19
|
return "#{self.first_name} #{self.last_name}"
|
15
20
|
end
|
16
21
|
end
|
@@ -1,11 +1,6 @@
|
|
1
1
|
<%=content_for :data_controls do%>
|
2
2
|
<%=link_to "Edit",edit_spud_admin_user_path(:id => @user.id),:class => "ajax",:title => "Edit User"%> | <%=link_to "Remove",spud_admin_user_path(:id => @user.id),:method => :delete,:title => "Remove User",:confirm => "Are you sure you wish to remove this user?"%>
|
3
3
|
<%end%>
|
4
|
-
<%=content_for :detail_nav do%>
|
5
|
-
<ul class="detail_nav">
|
6
|
-
<li><%=link_to "Permissions","#"%></li>
|
7
|
-
</ul>
|
8
|
-
<%end%>
|
9
4
|
|
10
5
|
<%=content_for :detail do%>
|
11
6
|
<div class="info_card">
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spud_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-01-
|
12
|
+
date: 2012-01-31 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
16
|
-
requirement: &
|
16
|
+
requirement: &70238968310620 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 3.1.3
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70238968310620
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rails
|
27
|
-
requirement: &
|
27
|
+
requirement: &70238968309540 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 3.1.3
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70238968309540
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: authlogic
|
38
|
-
requirement: &
|
38
|
+
requirement: &70238968308420 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70238968308420
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: jquery-rails
|
49
|
-
requirement: &
|
49
|
+
requirement: &70238968307760 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70238968307760
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: dynamic_form
|
60
|
-
requirement: &
|
60
|
+
requirement: &70238968305660 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70238968305660
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: breadcrumbs_on_rails
|
71
|
-
requirement: &
|
71
|
+
requirement: &70238968401780 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70238968401780
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: will_paginate
|
82
|
-
requirement: &
|
82
|
+
requirement: &70238968399560 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,7 +87,7 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70238968399560
|
91
91
|
description:
|
92
92
|
email: destes@redwindsw.com
|
93
93
|
executables: []
|
@@ -242,7 +242,6 @@ files:
|
|
242
242
|
- app/assets/stylesheets/spud/users.css
|
243
243
|
- app/controllers/spud/admin/application_controller.rb
|
244
244
|
- app/controllers/spud/admin/dashboard_controller.rb
|
245
|
-
- app/controllers/spud/admin/settings_controller.rb
|
246
245
|
- app/controllers/spud/admin/users_controller.rb
|
247
246
|
- app/controllers/spud/application_controller.rb
|
248
247
|
- app/controllers/spud/setup_controller.rb
|
@@ -257,7 +256,6 @@ files:
|
|
257
256
|
- app/helpers/spud/user_sessions_helper.rb
|
258
257
|
- app/helpers/spud/users_helper.rb
|
259
258
|
- app/models/spud_admin_permission.rb
|
260
|
-
- app/models/spud_setting.rb
|
261
259
|
- app/models/spud_user.rb
|
262
260
|
- app/models/spud_user_session.rb
|
263
261
|
- app/views/layouts/spud/admin/application.html.erb
|
@@ -268,7 +266,9 @@ files:
|
|
268
266
|
- app/views/spud/admin/users/_edit.html.erb
|
269
267
|
- app/views/spud/admin/users/_form.html.erb
|
270
268
|
- app/views/spud/admin/users/_new.html.erb
|
269
|
+
- app/views/spud/admin/users/edit.html.erb
|
271
270
|
- app/views/spud/admin/users/index.html.erb
|
271
|
+
- app/views/spud/admin/users/new.html.erb
|
272
272
|
- app/views/spud/admin/users/show.html.erb
|
273
273
|
- app/views/spud/setup/index.html.erb
|
274
274
|
- app/views/spud/sitemaps/show.xml.builder
|
@@ -1,15 +0,0 @@
|
|
1
|
-
class Spud::Admin::SettingsController < Spud::Admin::ApplicationController
|
2
|
-
layout 'spud/admin/detail'
|
3
|
-
add_breadcrumb "Settings", :spud_admin_settings_path
|
4
|
-
def index
|
5
|
-
@spud_settings = SpudSetting.all
|
6
|
-
end
|
7
|
-
|
8
|
-
def create
|
9
|
-
@spud_settings = SpudSetting.all
|
10
|
-
if params[:spud_settings].blank?
|
11
|
-
flash[:error] = "Spud Settings not specified!"
|
12
|
-
redirect_to spud_admin_settings_url()
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
data/app/models/spud_setting.rb
DELETED