summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/meetingtools/apps/room/views.py9
-rw-r--r--src/templates/base.html2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/meetingtools/apps/room/views.py b/src/meetingtools/apps/room/views.py
index aa08d9e..b2c3e13 100644
--- a/src/meetingtools/apps/room/views.py
+++ b/src/meetingtools/apps/room/views.py
@@ -272,6 +272,9 @@ def _import_room(request,acc,r):
room = None
pass
+ if not room:
+ return None
+
logging.debug("+++ looking at user counts")
api = ac_api_client(request,acc)
userlist = api.request('meeting-usermanager-user-list',{'sco-id': room.sco_id},False)
@@ -442,7 +445,7 @@ def list_by_tag(request,tn):
'edit':False,
'active':len(rooms) == 1,
'baseurl': BASE_URL,
- 'tags': tn,
+ 'tagstring': tn,
'rooms':rooms})
def widget(request,tags=None):
@@ -482,9 +485,11 @@ def tag(request,rid):
else:
form = TagRoomForm()
+ tags = Tag.objects.get_for_object(room)
+ tn = "+".join([t.name for t in tags])
return respond_to(request,
{'text/html': "apps/room/tag.html"},
- {'form': form,'formtitle': 'Add Tag','cancelname':'Done','submitname': 'Add Tag','room': room, 'tags': Tag.objects.get_for_object(room)})
+ {'form': form,'formtitle': 'Add Tag','cancelname':'Done','submitname': 'Add Tag','room': room, 'tagstring': tn,'tags': tags})
from time import mktime
diff --git a/src/templates/base.html b/src/templates/base.html
index 77bb130..e905948 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -91,7 +91,7 @@
<li>
<ul>
<li><h3>Developers</h3></li>
- {% if tags %}
+ {% if tagstring %}
<li><a href="{% prefix %}/widget/+{{tags}}">Meetingtools jQuery widget</a></li>
{% else %}
<li><a href="{% prefix %}/widget/+example">Meetingtools jQuery widget</a></li>