marrub
/
snipt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix busted team select.

master
Nick Sergeant 2015-10-19 00:53:37 -04:00
parent 39cab89c49
commit bac36dc309
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
media/js/src/modules/snipt.js
View File

@ -231,10 +231,12 @@
}
// Init user
var $selectUser = $('select#id_user', window.site.$main_edit);
$selectUser.chosen();
$selectUser.val(window.intended_user);
$selectUser.trigger('chosen:updated');
if (window.teams.length) {
var $selectUser = $('select#id_user', window.site.$main_edit);
$selectUser.chosen();
$selectUser.val(window.intended_user);
$selectUser.trigger('chosen:updated');
}
// Full-screen mode.
this.setupCodeMirrorFullScreen();
@ -480,12 +482,19 @@
code = window.editor.getValue();
}
var intendedUser;
if (window.teams.length) {
intendedUser = $('select[name="user"]').val();
} else {
intendedUser = window.intended_user;
}
that.model.save({
'title': $('input#snipt_title').val(),
'tags': $('label.tags textarea').val(),
'tags_list': $('label.tags textarea').val(),
'lexer': $('select[name="lexer"]').val(),
'intended_user': $('select[name="user"]').val(),
'intended_user': intendedUser,
'lexer_name': $('select[name="lexer"] option:selected').text(),
'code': code,
'description': $('textarea[name="description"]').val(),

33
templates/base.html
View File

@ -113,24 +113,24 @@
{% else %}
<li class="teams-nav">
<a href="#" class="teams-nav {% if '/for-teams/' in request.path %}active{% endif %}">Teams</a>
{% if request.user.profile.has_teams %}
<ul>
{% for team in request.user.profile.teams|dictsort:'name' %}
<li>
<a href="/{{ team.user.username }}/">
<i class="icon-user icon-white"></i>
{{ team.name }}
</a>
</li>
{% endfor %}
<li>
<a href="/for-teams/">
<i class="icon-plus icon-white"></i>
Create new team
</a>
</li>
{% if request.user.profile.has_teams %}
{% for team in request.user.profile.teams|dictsort:'name' %}
<li>
<a href="/{{ team.user.username }}/">
<i class="icon-user icon-white"></i>
{{ team.name }}
</a>
</li>
{% endfor %}
{% endif %}
<li>
<a href="/for-teams/">
<i class="icon-plus icon-white"></i>
Create new team
</a>
</li>
</ul>
{% endif %}
</li>
{% endif %}
</ul>
@ -393,6 +393,7 @@
'{{ team.slug }}',
{% endfor %}
]
window.intended_user = '{{ request.user.username }}';
{% if public %}
window.pub = {{ public|lower }};