tildetown
/
tildetown-admin
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Compare commits

base: tildetown:90dca0274a3def20b0b414519250ef6c6d5dbefb
Branches Tags
tildetown:master
tildetown:helpdesk-email
tildetown:admin-improvements
tildetown:zoho
tildetown:pause-signups
tildetown:new-signup-questions
tildetown:feature/enhanced-ticket-view
tildetown:add-key-for-user
..
compare: tildetown:77d728a1531dc70a5161ec8542475d14ae2961f9
Branches Tags
tildetown:master
tildetown:helpdesk-email
tildetown:admin-improvements
tildetown:zoho
tildetown:pause-signups
tildetown:new-signup-questions
tildetown:feature/enhanced-ticket-view
tildetown:add-key-for-user

No commits in common. "90dca0274a3def20b0b414519250ef6c6d5dbefb" and "77d728a1531dc70a5161ec8542475d14ae2961f9" have entirely different histories.
90dca0274a ... 77d728a153

2 changed files with 3 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
ttadmin/guestbook/templates/guestbook/guestbook.html
View File

@ -20,15 +20,15 @@
</head> </head>
<body> <body>
<h1>tilde.town guestbook</h1> <h1>tilde.town guestbook</h1>
<p><em>don't try to post urls. it won't work.</em></p>
<marquee>~*~*~*~*say hello*~*~*~*~</marquee> <marquee>~*~*~*~*say hello*~*~*~*~</marquee>
<form class="tilde" action="{% url 'guestbook:guestbook' %}" method="post"> <!-- <form class="tilde" action="{% url 'guestbook:guestbook' %}" method="post">
{% csrf_token %} {% csrf_token %}
<table> <table>
{{form.as_table}} {{form.as_table}}
</table> </table>
<input type="submit" value="sign" > <input type="submit" value="sign" >
</form> </form>
-->
{% for m in messages %} {% for m in messages %}
<p> <p>

11
ttadmin/users/models.py
View File

@ -78,13 +78,6 @@ class Townie(User):
def home(self): def home(self):
return os.path.join('/home', self.username) return os.path.join('/home', self.username)
def generate_gift(self):
command = '/town/bin/generate_welcome_present.sh'
error = _guarded_run(['sudo', command, self.username])
if error:
logger.error(error)
return
def send_welcome_email(self): def send_welcome_email(self):
welcome_tmpl = get_template('users/welcome_email.txt') welcome_tmpl = get_template('users/welcome_email.txt')
context = { context = {
@ -257,11 +250,9 @@ def on_townie_pre_save(sender, instance, **kwargs):
instance.create_on_disk() instance.create_on_disk()
instance.write_authorized_keys() instance.write_authorized_keys()
except Exception as e: except Exception as e:
logger.error('Failed syncing user {} to disk: {}'.format(instance.username, e)) logger.error('Failed syncing user {} to disk: {}'.format(instance.username, e)
else: else:
instance.send_welcome_email() instance.send_welcome_email()
instance.generate_gift()
return return
else: else:
# This user state transition is currently undefined. In the future, we can check for things # This user state transition is currently undefined. In the future, we can check for things