tb_core 1.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/controllers/spud/admin/application_controller.rb +2 -2
- data/app/controllers/spud/{password_resets_controller.rb → admin/password_resets_controller.rb} +13 -11
- data/app/controllers/spud/admin/settings_controller.rb +27 -0
- data/app/controllers/spud/{user_sessions_controller.rb → admin/user_sessions_controller.rb} +13 -7
- data/app/controllers/spud/application_controller.rb +61 -61
- data/app/controllers/spud/setup_controller.rb +2 -2
- data/app/mailers/spud/core_mailer.rb +1 -1
- data/app/views/layouts/spud/admin/application.html.erb +3 -2
- data/app/views/spud/{password_resets/new.html.erb → admin/password_resets/index.html.erb} +1 -1
- data/app/views/spud/{password_resets/edit.html.erb → admin/password_resets/show.html.erb} +3 -3
- data/app/views/spud/{users → admin/settings}/_form.html.erb +1 -1
- data/app/views/spud/admin/settings/edit.html.erb +8 -0
- data/app/views/spud/{user_sessions → admin/user_sessions}/new.html.erb +3 -3
- data/config/routes.rb +24 -15
- data/lib/spud_core/configuration.rb +6 -1
- data/lib/spud_core/version.rb +1 -1
- data/spec/controllers/spud/admin/application_controller_spec.rb +1 -1
- data/spec/controllers/spud/{password_reset_controller_spec.rb → admin/password_reset_controller_spec.rb} +11 -11
- data/spec/controllers/spud/{users_controller_spec.rb → admin/settings_controller_spec.rb} +5 -19
- data/spec/controllers/spud/{user_sessions_controller_spec.rb → admin/user_sessions_controller_spec.rb} +7 -7
- data/spec/controllers/spud/setup_controller_spec.rb +2 -2
- data/spec/dummy/log/test.log +34192 -0
- metadata +16 -16
- data/app/controllers/spud/users_controller.rb +0 -45
- data/app/views/spud/users/settings.html.erb +0 -12
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tb_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Greg Woods
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-06-
|
11
|
+
date: 2013-06-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -446,13 +446,13 @@ files:
|
|
446
446
|
- app/assets/stylesheets/spud/users.css
|
447
447
|
- app/controllers/spud/admin/application_controller.rb
|
448
448
|
- app/controllers/spud/admin/dashboard_controller.rb
|
449
|
+
- app/controllers/spud/admin/password_resets_controller.rb
|
450
|
+
- app/controllers/spud/admin/settings_controller.rb
|
451
|
+
- app/controllers/spud/admin/user_sessions_controller.rb
|
449
452
|
- app/controllers/spud/admin/users_controller.rb
|
450
453
|
- app/controllers/spud/application_controller.rb
|
451
|
-
- app/controllers/spud/password_resets_controller.rb
|
452
454
|
- app/controllers/spud/setup_controller.rb
|
453
455
|
- app/controllers/spud/sitemaps_controller.rb
|
454
|
-
- app/controllers/spud/user_sessions_controller.rb
|
455
|
-
- app/controllers/spud/users_controller.rb
|
456
456
|
- app/helpers/spud/admin/application_helper.rb
|
457
457
|
- app/helpers/spud/application_helper.rb
|
458
458
|
- app/helpers/spud/password_resets_helper.rb
|
@@ -467,6 +467,11 @@ files:
|
|
467
467
|
- app/views/layouts/spud/login/application.html.erb
|
468
468
|
- app/views/layouts/spud/setup.html.erb
|
469
469
|
- app/views/spud/admin/dashboard/index.html.erb
|
470
|
+
- app/views/spud/admin/password_resets/index.html.erb
|
471
|
+
- app/views/spud/admin/password_resets/show.html.erb
|
472
|
+
- app/views/spud/admin/settings/_form.html.erb
|
473
|
+
- app/views/spud/admin/settings/edit.html.erb
|
474
|
+
- app/views/spud/admin/user_sessions/new.html.erb
|
470
475
|
- app/views/spud/admin/users/_edit.html.erb
|
471
476
|
- app/views/spud/admin/users/_form.html.erb
|
472
477
|
- app/views/spud/admin/users/_new.html.erb
|
@@ -476,13 +481,8 @@ files:
|
|
476
481
|
- app/views/spud/admin/users/show.html.erb
|
477
482
|
- app/views/spud/core_mailer/forgot_password_notification.html.erb
|
478
483
|
- app/views/spud/core_mailer/forgot_password_notification.text.erb
|
479
|
-
- app/views/spud/password_resets/edit.html.erb
|
480
|
-
- app/views/spud/password_resets/new.html.erb
|
481
484
|
- app/views/spud/setup/index.html.erb
|
482
485
|
- app/views/spud/sitemaps/show.xml.builder
|
483
|
-
- app/views/spud/user_sessions/new.html.erb
|
484
|
-
- app/views/spud/users/_form.html.erb
|
485
|
-
- app/views/spud/users/settings.html.erb
|
486
486
|
- config/routes.rb
|
487
487
|
- db/migrate/20111214161011_create_spud_admin_permissions.rb
|
488
488
|
- db/migrate/20111214161146_create_spud_users.rb
|
@@ -503,13 +503,13 @@ files:
|
|
503
503
|
- README.markdown
|
504
504
|
- spec/controllers/spud/admin/application_controller_spec.rb
|
505
505
|
- spec/controllers/spud/admin/dashboard_controller_spec.rb
|
506
|
+
- spec/controllers/spud/admin/password_reset_controller_spec.rb
|
507
|
+
- spec/controllers/spud/admin/settings_controller_spec.rb
|
508
|
+
- spec/controllers/spud/admin/user_sessions_controller_spec.rb
|
506
509
|
- spec/controllers/spud/admin/users_controller_spec.rb
|
507
510
|
- spec/controllers/spud/application_controller_spec.rb
|
508
|
-
- spec/controllers/spud/password_reset_controller_spec.rb
|
509
511
|
- spec/controllers/spud/setup_controller_spec.rb
|
510
512
|
- spec/controllers/spud/sitemap_controllers_spec.rb
|
511
|
-
- spec/controllers/spud/user_sessions_controller_spec.rb
|
512
|
-
- spec/controllers/spud/users_controller_spec.rb
|
513
513
|
- spec/dummy/app/assets/javascripts/application.js
|
514
514
|
- spec/dummy/app/assets/stylesheets/application.css
|
515
515
|
- spec/dummy/app/controllers/application_controller.rb
|
@@ -573,13 +573,13 @@ summary: Twice Baked Core Engine
|
|
573
573
|
test_files:
|
574
574
|
- spec/controllers/spud/admin/application_controller_spec.rb
|
575
575
|
- spec/controllers/spud/admin/dashboard_controller_spec.rb
|
576
|
+
- spec/controllers/spud/admin/password_reset_controller_spec.rb
|
577
|
+
- spec/controllers/spud/admin/settings_controller_spec.rb
|
578
|
+
- spec/controllers/spud/admin/user_sessions_controller_spec.rb
|
576
579
|
- spec/controllers/spud/admin/users_controller_spec.rb
|
577
580
|
- spec/controllers/spud/application_controller_spec.rb
|
578
|
-
- spec/controllers/spud/password_reset_controller_spec.rb
|
579
581
|
- spec/controllers/spud/setup_controller_spec.rb
|
580
582
|
- spec/controllers/spud/sitemap_controllers_spec.rb
|
581
|
-
- spec/controllers/spud/user_sessions_controller_spec.rb
|
582
|
-
- spec/controllers/spud/users_controller_spec.rb
|
583
583
|
- spec/dummy/app/assets/javascripts/application.js
|
584
584
|
- spec/dummy/app/assets/stylesheets/application.css
|
585
585
|
- spec/dummy/app/controllers/application_controller.rb
|
@@ -1,45 +0,0 @@
|
|
1
|
-
class Spud::UsersController < Spud::ApplicationController
|
2
|
-
before_filter :require_user
|
3
|
-
layout 'spud/admin/detail'
|
4
|
-
|
5
|
-
def settings
|
6
|
-
if current_user.has_admin_rights?
|
7
|
-
add_breadcrumb "Dashboard", :spud_admin_root_path
|
8
|
-
end
|
9
|
-
add_breadcrumb "Settings", :spud_settings_path
|
10
|
-
@page_thumbnail = "spud/admin/users_thumb.png"
|
11
|
-
@page_name = "Settings"
|
12
|
-
end
|
13
|
-
|
14
|
-
def update
|
15
|
-
|
16
|
-
add_breadcrumb "Settings", :spud_settings_path
|
17
|
-
@page_thumbnail = "spud/admin/users_thumb.png"
|
18
|
-
@page_name = "Settings"
|
19
|
-
if @current_user.update_attributes(params[:spud_user].slice :login,:first_name,:last_name,:email,:password,:password_confirmation,:time_zone)
|
20
|
-
flash[:notice] = "User settings saved successfully."
|
21
|
-
redirect_to spud_admin_root_url()
|
22
|
-
else
|
23
|
-
flash[:error] = "There was an error while saving the user."
|
24
|
-
render :action => "settings"
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
|
29
|
-
def save_setting
|
30
|
-
if params[:key].blank?
|
31
|
-
render :status => 500,:text => nil and return
|
32
|
-
end
|
33
|
-
|
34
|
-
setting = @current_user.spud_user_settings.where(:key => params[:key]).first
|
35
|
-
if setting.blank?
|
36
|
-
setting = @current_user.spud_user_settings.new(:key => params[:key])
|
37
|
-
end
|
38
|
-
setting.value = params[:value]
|
39
|
-
if setting.save
|
40
|
-
render :status => 200,:text => nil and return
|
41
|
-
else
|
42
|
-
render :status => 500,:text => nil and return
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
@@ -1,12 +0,0 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
<p>Fields marked with * are required and must be filled out.</p>
|
4
|
-
|
5
|
-
<%=form_for @current_user,:url => spud_user_path(),:html=>{:class=>"form-horizontal"} do |f|%>
|
6
|
-
<%=render :partial => "form",:locals => {:f => f}%>
|
7
|
-
<div class="form-actions">
|
8
|
-
<%=f.submit "Save Settings", :class=>"btn btn-primary"%> or <%=link_to "cancel",request.referer,:class => "btn"%>
|
9
|
-
</div>
|
10
|
-
<%end%>
|
11
|
-
|
12
|
-
|