fixes to sprint #5

hasadna · Jan 8, 2014 · 1e82f55 · 1e82f55
1 parent 5a5c4c3
commit 1e82f55
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/issues/views.py b/src/issues/views.py
@@ -180,6 +180,13 @@ def form_valid(self, form):
         return super(IssueCreateView, self).form_valid(form)
 
 
+    def get_success_url(self):
+        url = super(IssueCreateView, self).get_success_url()
+        if not self.upcoming:
+            url += '?s=1'
+        return url
+
+
 class IssueEditView(AjaxFormView, IssueMixin, UpdateView):
 
     required_permission = 'issues.editopen_issue'

diff --git a/src/ocd/static/js/filter.js b/src/ocd/static/js/filter.js
@@ -10,11 +10,11 @@ function toggleTitles() {
 }
 
 function setHeight() {
-	var Issues = $('.issue_right_column').outerHeight();
-	var Issue = $('.issue_left_column').outerHeight();
-  // console.log('----------> ' + Issues + ' , ' + Issue)
-	if (Issues > Issue) {
-		$('.issue_left_column').outerHeight(Issues+20);
+	var issues_h = $('.issue_right_column').outerHeight();
+	var frame_h = $('.issue_left_column').outerHeight();
+	var inner_h = $('.issue_left_column_inner').outerHeight();
+	if ((inner_h > frame_h) || (issues_h > frame_h)) {
+		  $('.issue_left_column').outerHeight(Math.max(inner_h, issues_h)+20);
 	};
 }
 

diff --git a/src/users/forms.py b/src/users/forms.py
@@ -31,7 +31,7 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
       super(InvitationForm, self).__init__(*args, **kwargs)
-      self.fields.insert(0, 'name', forms.CharField(label=_('Name')))
+      self.fields.insert(0, 'name', forms.CharField(label=_('Name'), required=False))
 
     def clean_email(self):
         return self.cleaned_data.get("email").lower()