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

33
templates/base.html
View File

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