Show More
@@ -211,7 +211,7 b' if you closed it reopen it following the' | |||||
211 | cd C:\Kallithea\Bin |
|
211 | cd C:\Kallithea\Bin | |
212 | paster make-config Kallithea production.ini |
|
212 | paster make-config Kallithea production.ini | |
213 |
|
213 | |||
214 |
Then, you must edit production.ini to fit your needs ( |
|
214 | Then, you must edit production.ini to fit your needs (network address and | |
215 | port, mail settings, database, whatever). I recommend using NotePad++ |
|
215 | port, mail settings, database, whatever). I recommend using NotePad++ | |
216 | (free) or similar text editor, as it handles well the EndOfLine |
|
216 | (free) or similar text editor, as it handles well the EndOfLine | |
217 | character differences between Unix and Windows |
|
217 | character differences between Unix and Windows |
@@ -499,7 +499,7 b' class UsersController(BaseController):' | |||||
499 | user_model = UserModel() |
|
499 | user_model = UserModel() | |
500 | user_model.delete_extra_ip(id, ip_id) |
|
500 | user_model.delete_extra_ip(id, ip_id) | |
501 | Session().commit() |
|
501 | Session().commit() | |
502 |
h.flash(_("Removed |
|
502 | h.flash(_("Removed IP address from user whitelist"), category='success') | |
503 |
|
503 | |||
504 | if 'default_user' in request.POST: |
|
504 | if 'default_user' in request.POST: | |
505 | return redirect(url('admin_permissions_ips')) |
|
505 | return redirect(url('admin_permissions_ips')) |
@@ -55,7 +55,7 b' def submit(recaptcha_challenge_field, re' | |||||
55 | recaptcha_challenge_field -- The value of recaptcha_challenge_field from the form |
|
55 | recaptcha_challenge_field -- The value of recaptcha_challenge_field from the form | |
56 | recaptcha_response_field -- The value of recaptcha_response_field from the form |
|
56 | recaptcha_response_field -- The value of recaptcha_response_field from the form | |
57 | private_key -- your reCAPTCHA private key |
|
57 | private_key -- your reCAPTCHA private key | |
58 |
remoteip -- the user's |
|
58 | remoteip -- the user's IP address | |
59 | """ |
|
59 | """ | |
60 |
|
60 | |||
61 | if not (recaptcha_response_field and recaptcha_challenge_field and |
|
61 | if not (recaptcha_response_field and recaptcha_challenge_field and |
@@ -161,7 +161,7 b' def action_logger(user, action, repo, ip' | |||||
161 | easy translations |
|
161 | easy translations | |
162 | :param repo: string name of repository or object containing repo_id, |
|
162 | :param repo: string name of repository or object containing repo_id, | |
163 | that action was made on |
|
163 | that action was made on | |
164 |
:param ipaddr: optional |
|
164 | :param ipaddr: optional IP address from what the action was made | |
165 | :param sa: optional sqlalchemy session |
|
165 | :param sa: optional sqlalchemy session | |
166 |
|
166 | |||
167 | """ |
|
167 | """ |
@@ -447,7 +447,7 b' class UserModel(BaseModel):' | |||||
447 |
|
447 | |||
448 | def add_extra_ip(self, user, ip): |
|
448 | def add_extra_ip(self, user, ip): | |
449 | """ |
|
449 | """ | |
450 |
Adds |
|
450 | Adds IP address to UserIpMap | |
451 |
|
451 | |||
452 | :param user: |
|
452 | :param user: | |
453 | :param ip: |
|
453 | :param ip: | |
@@ -465,7 +465,7 b' class UserModel(BaseModel):' | |||||
465 |
|
465 | |||
466 | def delete_extra_ip(self, user, ip_id): |
|
466 | def delete_extra_ip(self, user, ip_id): | |
467 | """ |
|
467 | """ | |
468 |
Removes |
|
468 | Removes IP address from UserIpMap | |
469 |
|
469 | |||
470 | :param user: |
|
470 | :param user: | |
471 | :param ip_id: |
|
471 | :param ip_id: |
@@ -10,7 +10,7 b'' | |||||
10 | ${h.hidden('del_ip_id',ip.ip_id)} |
|
10 | ${h.hidden('del_ip_id',ip.ip_id)} | |
11 | ${h.hidden('default_user', 'True')} |
|
11 | ${h.hidden('default_user', 'True')} | |
12 | <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, |
|
12 | <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, | |
13 |
class_="action_button", onclick="return confirm('"+_('Confirm to delete this |
|
13 | class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} | |
14 | ${h.end_form()} |
|
14 | ${h.end_form()} | |
15 | </td> |
|
15 | </td> | |
16 | </tr> |
|
16 | </tr> | |
@@ -27,7 +27,7 b'' | |||||
27 | <div class="fields"> |
|
27 | <div class="fields"> | |
28 | <div class="field"> |
|
28 | <div class="field"> | |
29 | <div class="label"> |
|
29 | <div class="label"> | |
30 |
<label for="new_ip">${_('New |
|
30 | <label for="new_ip">${_('New IP address')}:</label> | |
31 | </div> |
|
31 | </div> | |
32 | <div class="input"> |
|
32 | <div class="input"> | |
33 | ${h.hidden('default_user', 'True')} |
|
33 | ${h.hidden('default_user', 'True')} |
@@ -20,7 +20,7 b'' | |||||
20 | ${h.hidden('del_ip_id',ip.ip_id)} |
|
20 | ${h.hidden('del_ip_id',ip.ip_id)} | |
21 | <i class="icon-minus-circled" style="color:#FF4444"></i> |
|
21 | <i class="icon-minus-circled" style="color:#FF4444"></i> | |
22 | ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, |
|
22 | ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, | |
23 |
class_="action_button", onclick="return confirm('"+_('Confirm to delete this |
|
23 | class_="action_button", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")} | |
24 | ${h.end_form()} |
|
24 | ${h.end_form()} | |
25 | </td> |
|
25 | </td> | |
26 | </tr> |
|
26 | </tr> | |
@@ -39,7 +39,7 b'' | |||||
39 | <div class="fields"> |
|
39 | <div class="fields"> | |
40 | <div class="field"> |
|
40 | <div class="field"> | |
41 | <div class="label"> |
|
41 | <div class="label"> | |
42 |
<label for="new_ip">${_('New |
|
42 | <label for="new_ip">${_('New IP address')}:</label> | |
43 | </div> |
|
43 | </div> | |
44 | <div class="input"> |
|
44 | <div class="input"> | |
45 | ${h.text('new_ip', class_='medium')} |
|
45 | ${h.text('new_ip', class_='medium')} |
General Comments 0
You need to be logged in to leave comments.
Login now