Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

layout_ref: fix calendar subscriptions preview text

Browse source
This commit is contained in:
Felix Niklas 2015-06-29 13:23:41 +02:00
parent 12307e0015
commit 3965f9ea61
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -1472,23 +1472,27 @@ class calendarSubscriptionsRef extends App.ControllerContent
own = data.filter((entry) -> entry.name.indexOf('own') >= 0) own = data.filter((entry) -> entry.name.indexOf('own') >= 0)
not_assigned = data.filter((entry) -> entry.name.indexOf('not_assigned') >= 0) not_assigned = data.filter((entry) -> entry.name.indexOf('not_assigned') >= 0)
if own.length > 0
if own.length is optionCount if own.length is optionCount
modules.push "all my" modules.push "all my tickets"
else else
modules.push.apply modules, own.map (entry) -> modules.push.apply modules, own.map (entry) ->
[option, value] = entry.name.split('/') [option, value] = entry.name.split('/')
return "#{ translationTable[value] } #{ translationTable[option] }" return "#{ translationTable[value] } #{ translationTable[option] }"
modules[modules.length-1] += " tickets"
if not_assigned.length > 0
if not_assigned.length is optionCount if not_assigned.length is optionCount
modules.push "all not assigned" modules.push "all not assigned tickets"
else else
modules.push.apply modules, not_assigned.map (entry) -> modules.push.apply modules, not_assigned.map (entry) ->
[option, value] = entry.name.split('/') [option, value] = entry.name.split('/')
return "#{ translationTable[value] } #{ translationTable[option] }" return "#{ translationTable[value] } #{ translationTable[option] }"
modules[modules.length-1] += " tickets"
@output @output
.attr 'disabled', false .attr 'disabled', false
.text "Subscription to #{ @joinItems modules } tickets:" .text "Subscription to #{ @joinItems modules }:"
joinItems: (items) -> joinItems: (items) ->
switch items.length switch items.length

5
app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
View file

@ -8,7 +8,10 @@
<p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p> <p><%= @T('See your tickets from within your favorite calendar by adding the following url to your calendar app.') %></p>
<h3><%= @T('URL') %></h3> <h3><%= @T('URL') %></h3>
<input class="form-control js-select" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets"> <div class="output-input">
<output class="js-output"></output>
<input class="form-control js-select" readonly value="<%= @baseurl %>/calendar_subscriptions/tickets">
</div>
<h3><%= @T('Subscription Settings') %></h3> <h3><%= @T('Subscription Settings') %></h3>
<table class="settings-list"> <table class="settings-list">