Merge pull request #1603 from normanjaeckel/FixStable

Fixed error when starting webbrowser. Added info on port to general start message.

CHANGELOG

@@ -8,6 +8,17 @@ Version 1.7.1 (unreleased)
 ==========================
 [https://github.com/OpenSlides/OpenSlides/milestones/1.7.1]
 
+Motions:
+- Show amendment button for users with permission 'can_create_motion'
+  only.
+- Fixed check_permission in motion support view.
+- Fixed apply url for motion poll update view.
+Assignments:
+- Fixed tooltip to set a candidate as not elected.
+Other:
+- Fixed error when starting webbrowser.
+- Added info on port to general start script message.
+
 
 Version 1.7 (2015-02-16)
 ========================

openslides/assignment/templates/assignment/assignment_detail.html

@@ -196,7 +196,7 @@
                 {% if candidate in assignment.elected %}
                     {% if perms.assignment.can_manage_assignment %}
                         <a class="election_link elected tooltip-bottom" href="{% url 'assignment_user_not_elected' assignment.id candidate.person_id %}"
-                            data-original-title="{% trans 'Mark candidate as elected' %}"></a>
+                            data-original-title="{% trans 'Mark candidate as not elected' %}"></a>
                     {% else %}
                         <a class="elected">
                             <img src="{% static 'img/voting-yes.png' %}" class="tooltip-bottom" data-original-title="{% trans 'Candidate is elected' %}">

openslides/motion/templates/motion/motion_detail.html

@@ -291,7 +291,7 @@
         </h5>
         {{ version.creation_time }}
 
-        {% if 'motion_amendments_enabled'|get_config %}
+        {% if perms.motion.can_create_motion and 'motion_amendments_enabled'|get_config %}
             <h5>{% trans 'Amendments' %}:</h5>
             {% with amendments=motion.amendments.all %}
                 {% if amendments %}

openslides/motion/views.py

@@ -499,7 +499,7 @@ class SupportView(SingleObjectMixin, QuestionView):
     model = Motion
     support = True
 
-    def check_permission(self, request):
+    def check_permission(self, request, *args, **kwargs):
         """
         Return True if the user can support or unsupport the motion. Else: False.
         """
@@ -615,6 +615,11 @@ class PollUpdateView(PollMixin, PollFormView):
 
     template_name = 'motion/motionpoll_form.html'
 
+    def get_apply_url(self):
+        return reverse(
+            'motionpoll_update',
+            kwargs={'pk': self.kwargs['pk'], 'poll_number': self.kwargs['poll_number']})
+
     def get_context_data(self, **kwargs):
         """
         Return the template context.

openslides/utils/main.py

@@ -281,15 +281,19 @@ def start_browser(browser_url):
     Launches the default web browser at the given url and opens the
     webinterface.
     """
-    browser = webbrowser.get()
+    try:
+        browser = webbrowser.get()
+    except webbrowser.Error as e:
+        print('Web browser controller error: %s' % e)
+    else:
 
-    def function():
-        # TODO: Use a nonblocking sleep event here. Tornado has such features.
-        time.sleep(1)
-        browser.open(browser_url)
+        def function():
+            # TODO: Use a nonblocking sleep event here. Tornado has such features.
+            time.sleep(1)
+            browser.open(browser_url)
 
-    thread = threading.Thread(target=function)
-    thread.start()
+        thread = threading.Thread(target=function)
+        thread.start()
 
 
 def get_database_path_from_settings():

openslides/utils/tornado_webserver.py

@@ -74,7 +74,7 @@ def run_tornado(addr, port):
 
     # Print listening address and port to command line
     if addr == '0.0.0.0':
-        url_string = _("the machine's local ip address")
+        url_string = _("the machine's local ip address (port %s)") % port
     else:
         url_string = 'http://%s:%s' % (addr, port)
     print _("Starting OpenSlides' tornado webserver listening to %(url_string)s") % {'url_string': url_string}