backlog 0.20.0 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.txt +8 -0
- data/app/controllers/user_controller.rb +2 -2
- data/app/views/user/edit.rhtml +30 -25
- metadata +2 -2
data/History.txt
CHANGED
|
@@ -178,9 +178,9 @@ class UserController < ApplicationController
|
|
|
178
178
|
if already_monitoring
|
|
179
179
|
flash[:notice] = "#{@subscriber.name} is already monitoring your work sheets."
|
|
180
180
|
else
|
|
181
|
-
flash[:notice] = "Invitation sent to #{@subscriber.name}"
|
|
182
181
|
monitoring_url = url_for :action => :toggle_work_lock_monitoring, :id => @user
|
|
183
|
-
UserNotify.deliver_monitoring_invitation(@
|
|
182
|
+
UserNotify.deliver_monitoring_invitation(@subscriber, @user, monitoring_url)
|
|
183
|
+
flash[:notice] = "Invitation sent to #{@subscriber.name}"
|
|
184
184
|
end
|
|
185
185
|
render :template => '/display_notice', :layout => false
|
|
186
186
|
end
|
data/app/views/user/edit.rhtml
CHANGED
|
@@ -9,30 +9,6 @@
|
|
|
9
9
|
<h4><%=l :edit %></h4>
|
|
10
10
|
</div>
|
|
11
11
|
|
|
12
|
-
<% if @user == current_user %>
|
|
13
|
-
<table align="right">
|
|
14
|
-
<% unless @user.work_lock_subscribers.empty? %>
|
|
15
|
-
<tr><th>Subscribers</th></tr>
|
|
16
|
-
<% for subscriber in @user.work_lock_subscribers %>
|
|
17
|
-
<tr>
|
|
18
|
-
<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
|
|
19
|
-
<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
|
|
20
|
-
</tr>
|
|
21
|
-
<% end %>
|
|
22
|
-
<% end %>
|
|
23
|
-
<% unless @associates.empty? %>
|
|
24
|
-
<tr><td>
|
|
25
|
-
<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
|
|
26
|
-
<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
|
|
27
|
-
<td align="left"><%=submit_tag l(:invite)%></td>
|
|
28
|
-
<% end %>
|
|
29
|
-
</td></tr>
|
|
30
|
-
<% end %>
|
|
31
|
-
</table>
|
|
32
|
-
<% else %>
|
|
33
|
-
<% monitoring = @user.work_lock_subscribers.include? current_user %>
|
|
34
|
-
<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
|
|
35
|
-
<% end %>
|
|
36
12
|
<%= start_form_tag_helper %>
|
|
37
13
|
<%= render_partial 'edit', :user => @user, :submit => true %>
|
|
38
14
|
</form>
|
|
@@ -72,5 +48,34 @@
|
|
|
72
48
|
</table>
|
|
73
49
|
</div>
|
|
74
50
|
|
|
75
|
-
<br clear="
|
|
51
|
+
<br clear="left"/>
|
|
76
52
|
|
|
53
|
+
<div id="lfeature">
|
|
54
|
+
<div class="btitle">
|
|
55
|
+
<h4><%=l :subscriptions %></h4>
|
|
56
|
+
</div>
|
|
57
|
+
|
|
58
|
+
<% if @user == current_user %>
|
|
59
|
+
<table align="right">
|
|
60
|
+
<% unless @user.work_lock_subscribers.empty? %>
|
|
61
|
+
<% for subscriber in @user.work_lock_subscribers %>
|
|
62
|
+
<tr>
|
|
63
|
+
<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
|
|
64
|
+
<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
|
|
65
|
+
</tr>
|
|
66
|
+
<% end %>
|
|
67
|
+
<% end %>
|
|
68
|
+
<% unless @associates.empty? %>
|
|
69
|
+
<tr><td>
|
|
70
|
+
<% remote_form_for :user, :url => {:action => :invite_work_lock_subscriber} do |f| %>
|
|
71
|
+
<%=select :id, nil, @associates.map{|u| [u.name, u.id]}, {}, :name => 'id'%>
|
|
72
|
+
<td align="left"><%=submit_tag l(:invite)%></td>
|
|
73
|
+
<% end %>
|
|
74
|
+
</td></tr>
|
|
75
|
+
<% end %>
|
|
76
|
+
</table>
|
|
77
|
+
<% else %>
|
|
78
|
+
<% monitoring = @user.work_lock_subscribers.include? current_user %>
|
|
79
|
+
<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
|
|
80
|
+
<% end %>
|
|
81
|
+
</div>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: backlog
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.20.
|
|
4
|
+
version: 0.20.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Uwe Kubosch
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2008-01-
|
|
12
|
+
date: 2008-01-29 00:00:00 +01:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|