Skip to content

Commit dc3d520

Browse files
committed
User model stores Username from worksheets
1 parent b8aa228 commit dc3d520

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

app/controllers/spreadsheets_controller.rb

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def update
4343
spreadsheet = Spreadsheet.find(params['id'])
4444
@worksheet = worksheets(spreadsheet)
4545
@fails = User.add_users_from_worksheet(@worksheet, 2)
46-
#redirect_to users_path(fails: User.add_users_from_worksheet(@worksheet))
4746
end
4847

4948
def destroy

app/models/user.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def self.add_users_from_worksheet(worksheet, column = 1)
2323
worksheet.rows.count.times do |i|
2424
user = User.new(
2525
email_id: worksheet[i + 1, column],
26-
username: worksheet[i + 1, column],
26+
username: worksheet[i + 1, column - 1],
2727
is_subscribed: true,
2828
joined_on: Date.today,
2929
source: 'Google Spreadsheet')

app/views/newsletters/index.html.haml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
Test Mail
88
%h4
99
%strong Newsletters
10-
%hr
1110
%table.table
1211
-count=3
1312
-@newsletters.each do |newsletter|

config/deploy.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# repository - Git repo to clone from. (needed by mina/git)
1313
# branch - Branch name to deploy. (needed by mina/git)
1414

15-
set :domain, 'lightair.com'
16-
set :deploy_to, '/home/basnal/www/lightair.com'
15+
set :domain, '192.168.1.196'
16+
set :deploy_to, '/home/kanhaiya/www/lightair.com'
1717
set :repository, '[email protected]:joshsoftware/lightair.git'
1818
set :branch, 'master'
1919
set :identity_file, '/home/basnal/.ssh/id_rsa'
@@ -30,7 +30,7 @@
3030
'config/environment.yml']
3131

3232
# Optional settings:
33-
set :user, 'basnal' # Username in the server to SSH to.
33+
set :user, 'kanhaiya' # Username in the server to SSH to.
3434
# set :port, '30000' # SSH port number.
3535

3636
# This task is the environment that is loaded for most commands, such as

0 commit comments

Comments
 (0)