|
a/Allura/allura/lib/plugin.py |
|
b/Allura/allura/lib/plugin.py |
|
... |
|
... |
| 135 |
raise NotImplemented, 'upload_sshkey'
|
135 |
raise NotImplemented, 'upload_sshkey'
|
| 136 |
|
136 |
|
| 137 |
def account_navigation(self):
|
137 |
def account_navigation(self):
|
| 138 |
return [
|
138 |
return [
|
| 139 |
{
|
139 |
{
|
|
|
140 |
'tabid': 'account_user_prefs',
|
|
|
141 |
'title': 'Preferences',
|
|
|
142 |
'target': "/auth/preferences",
|
|
|
143 |
'alt': 'Manage Personal Preferences',
|
|
|
144 |
},
|
|
|
145 |
{
|
|
|
146 |
'tabid': 'account_user_info',
|
|
|
147 |
'title': 'Personal Info',
|
|
|
148 |
'target': "/auth/user_info",
|
|
|
149 |
'alt': 'Manage Personal Information',
|
|
|
150 |
},
|
|
|
151 |
{
|
| 140 |
'tabid': 'account_sfnet_beta_index',
|
152 |
'tabid': 'account_sfnet_beta_index',
|
| 141 |
'title': 'Subscriptions',
|
153 |
'title': 'Subscriptions',
|
| 142 |
'target': "/auth/prefs",
|
154 |
'target': "/auth/subscriptions",
|
| 143 |
'alt': 'Manage Subscription Preferences',
|
155 |
'alt': 'Manage Subscription Preferences',
|
| 144 |
},
|
156 |
},
|
| 145 |
]
|
157 |
]
|
| 146 |
|
158 |
|
| 147 |
def user_project_shortname(self, user):
|
159 |
def user_project_shortname(self, user):
|
|
... |
|
... |
| 622 |
def password_change_form(self):
|
634 |
def password_change_form(self):
|
| 623 |
'''
|
635 |
'''
|
| 624 |
:return: None, or an easywidgets Form to render on the user preferences page
|
636 |
:return: None, or an easywidgets Form to render on the user preferences page
|
| 625 |
'''
|
637 |
'''
|
| 626 |
from allura.lib.widgets.forms import PasswordChangeForm
|
638 |
from allura.lib.widgets.forms import PasswordChangeForm
|
| 627 |
return PasswordChangeForm(action='/auth/prefs/change_password')
|
639 |
return PasswordChangeForm(action='/auth/preferences/change_password')
|
| 628 |
|
640 |
|
| 629 |
@LazyProperty
|
641 |
@LazyProperty
|
| 630 |
def personal_data_form(self):
|
642 |
def personal_data_form(self):
|
| 631 |
'''
|
643 |
'''
|
| 632 |
:return: None, or an easywidgets Form to render on the user preferences page
|
644 |
:return: None, or an easywidgets Form to render on the user preferences page
|
|
... |
|
... |
| 675 |
'''
|
687 |
'''
|
| 676 |
:return: None, or an easywidgets Form to render on the user preferences page to
|
688 |
:return: None, or an easywidgets Form to render on the user preferences page to
|
| 677 |
allow adding a social network account.
|
689 |
allow adding a social network account.
|
| 678 |
'''
|
690 |
'''
|
| 679 |
from allura.lib.widgets.forms import AddSocialNetworkForm
|
691 |
from allura.lib.widgets.forms import AddSocialNetworkForm
|
| 680 |
return AddSocialNetworkForm(action='/auth/prefs/add_social_network')
|
692 |
return AddSocialNetworkForm(action='/auth/preferences/add_social_network')
|
| 681 |
|
693 |
|
| 682 |
@LazyProperty
|
694 |
@LazyProperty
|
| 683 |
def remove_socialnetwork_form(self):
|
695 |
def remove_socialnetwork_form(self):
|
| 684 |
'''
|
696 |
'''
|
| 685 |
:return: None, or an easywidgets Form to render on the user preferences page to
|
697 |
:return: None, or an easywidgets Form to render on the user preferences page to
|
| 686 |
allow removing a social network account.
|
698 |
allow removing a social network account.
|
| 687 |
'''
|
699 |
'''
|
| 688 |
from allura.lib.widgets.forms import RemoveSocialNetworkForm
|
700 |
from allura.lib.widgets.forms import RemoveSocialNetworkForm
|
| 689 |
return RemoveSocialNetworkForm(action='/auth/prefs/remove_social_network')
|
701 |
return RemoveSocialNetworkForm(action='/auth/preferences/remove_social_network')
|
| 690 |
|
702 |
|
| 691 |
@LazyProperty
|
703 |
@LazyProperty
|
| 692 |
def add_timeslot_form(self):
|
704 |
def add_timeslot_form(self):
|
| 693 |
'''
|
705 |
'''
|
| 694 |
:return: None, or an easywidgets Form to render on the user preferences page
|
706 |
:return: None, or an easywidgets Form to render on the user preferences page
|
|
... |
|
... |
| 747 |
'''
|
759 |
'''
|
| 748 |
:return: None, or an easywidgets Form to render on the page to add a
|
760 |
:return: None, or an easywidgets Form to render on the page to add a
|
| 749 |
new skill to a user profile
|
761 |
new skill to a user profile
|
| 750 |
'''
|
762 |
'''
|
| 751 |
from allura.lib.widgets.forms import AddUserSkillForm
|
763 |
from allura.lib.widgets.forms import AddUserSkillForm
|
| 752 |
return AddUserSkillForm(action='/auth/prefs/user_skills/save_skill')
|
764 |
return AddUserSkillForm(action='/auth/user_info/skills/save_skill')
|
| 753 |
|
765 |
|
| 754 |
@LazyProperty
|
766 |
@LazyProperty
|
| 755 |
def select_subcategory_form(self):
|
767 |
def select_subcategory_form(self):
|
| 756 |
'''
|
768 |
'''
|
| 757 |
:return: None, or an easywidgets Form to render on the page to add a
|
769 |
:return: None, or an easywidgets Form to render on the page to add a
|
| 758 |
new skill to a user profile, allowing to select a category in
|
770 |
new skill to a user profile, allowing to select a category in
|
| 759 |
order to see its sub-categories
|
771 |
order to see its sub-categories
|
| 760 |
'''
|
772 |
'''
|
| 761 |
from allura.lib.widgets.forms import SelectSubCategoryForm
|
773 |
from allura.lib.widgets.forms import SelectSubCategoryForm
|
| 762 |
return SelectSubCategoryForm(action='/auth/prefs/user_skills')
|
774 |
return SelectSubCategoryForm(action='/auth/user_info/skills/')
|
| 763 |
|
775 |
|
| 764 |
@LazyProperty
|
776 |
@LazyProperty
|
| 765 |
def remove_user_skill(self):
|
777 |
def remove_user_skill(self):
|
| 766 |
'''
|
778 |
'''
|
| 767 |
:return: None, or an easywidgets Form to render on the page to remove
|
779 |
:return: None, or an easywidgets Form to render on the page to remove
|
| 768 |
an existing skill from a user profile
|
780 |
an existing skill from a user profile
|
| 769 |
'''
|
781 |
'''
|
| 770 |
from allura.lib.widgets.forms import RemoveSkillForm
|
782 |
from allura.lib.widgets.forms import RemoveSkillForm
|
| 771 |
return RemoveSkillForm(action='/auth/prefs/user_skills/remove_skill')
|
783 |
return RemoveSkillForm(action='/auth/user_info/skills/remove_skill')
|
| 772 |
|
784 |
|
| 773 |
@LazyProperty
|
785 |
@LazyProperty
|
| 774 |
def upload_key_form(self):
|
786 |
def upload_key_form(self):
|
| 775 |
'''
|
787 |
'''
|
| 776 |
:return: None, or an easywidgets Form to render on the user preferences page
|
788 |
:return: None, or an easywidgets Form to render on the user preferences page
|
| 777 |
'''
|
789 |
'''
|
| 778 |
from allura.lib.widgets.forms import UploadKeyForm
|
790 |
from allura.lib.widgets.forms import UploadKeyForm
|
| 779 |
return UploadKeyForm(action='/auth/prefs/upload_sshkey')
|
791 |
return UploadKeyForm(action='/auth/preferences/upload_sshkey')
|
| 780 |
|
792 |
|
| 781 |
@property
|
793 |
@property
|
| 782 |
def master(self):
|
794 |
def master(self):
|
| 783 |
return self.master_template
|
795 |
return self.master_template
|
| 784 |
|
796 |
|