| @@ -72,14 +72,19 class AccountController < ApplicationController | |||
|
|
72 | 72 | # Change logged in user's password |
|
|
73 | 73 | def change_password |
|
|
74 | 74 | @user = self.logged_in_user |
|
|
75 |
flash |
|
|
|
75 | flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'my_account' and return if @user.auth_source_id | |
|
|
76 | 76 | if @user.check_password?(@params[:password]) |
|
|
77 | 77 | @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation] |
|
|
78 | flash.now[:notice] = l(:notice_account_password_updated) if @user.save | |
|
|
78 | if @user.save | |
|
|
79 | flash[:notice] = l(:notice_account_password_updated) | |
|
|
80 | else | |
|
|
81 | render :action => 'my_account' | |
|
|
82 | return | |
|
|
83 | end | |
|
|
79 | 84 | else |
|
|
80 |
flash |
|
|
|
85 | flash[:notice] = l(:notice_account_wrong_password) | |
|
|
81 | 86 | end |
|
|
82 |
re |
|
|
|
87 | redirect_to :action => 'my_account' | |
|
|
83 | 88 | end |
|
|
84 | 89 | |
|
|
85 | 90 | # Enable user to choose a new password |
| @@ -44,7 +44,7 class AdminController < ApplicationController | |||
|
|
44 | 44 | a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s |
|
|
45 | 45 | a.save |
|
|
46 | 46 | } |
|
|
47 |
flash[:notice] = |
|
|
|
47 | flash.now[:notice] = l(:notice_successful_update) | |
|
|
48 | 48 | end |
|
|
49 | 49 | end |
|
|
50 | 50 | |
| @@ -55,7 +55,7 class ApplicationController < ActionController::Base | |||
|
|
55 | 55 | def require_login |
|
|
56 | 56 | unless self.logged_in_user |
|
|
57 | 57 | store_location |
|
|
58 |
redirect_to |
|
|
|
58 | redirect_to :controller => "account", :action => "login" | |
|
|
59 | 59 | return false |
|
|
60 | 60 | end |
|
|
61 | 61 | true |
| @@ -64,8 +64,7 class ApplicationController < ActionController::Base | |||
|
|
64 | 64 | def require_admin |
|
|
65 | 65 | return unless require_login |
|
|
66 | 66 | unless self.logged_in_user.admin? |
|
|
67 | flash[:notice] = "Acces denied" | |
|
|
68 | redirect_to:controller => '' | |
|
|
67 | render :nothing => true, :status => 403 | |
|
|
69 | 68 | return false |
|
|
70 | 69 | end |
|
|
71 | 70 | true |
| @@ -86,8 +85,7 class ApplicationController < ActionController::Base | |||
|
|
86 | 85 | if @user_membership and Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], @user_membership.role_id ) |
|
|
87 | 86 | return true |
|
|
88 | 87 | end |
|
|
89 | flash[:notice] = "Acces denied" | |
|
|
90 | redirect_to :controller => '' | |
|
|
88 | render :nothing => true, :status => 403 | |
|
|
91 | 89 | false |
|
|
92 | 90 | end |
|
|
93 | 91 | |
| @@ -42,6 +42,7 class CustomFieldsController < ApplicationController | |||
|
|
42 | 42 | return |
|
|
43 | 43 | end |
|
|
44 | 44 | if request.post? and @custom_field.save |
|
|
45 | flash[:notice] = l(:notice_successful_create) | |
|
|
45 | 46 | redirect_to :action => 'list' |
|
|
46 | 47 | end |
|
|
47 | 48 | @trackers = Tracker.find(:all) |
| @@ -53,7 +54,7 class CustomFieldsController < ApplicationController | |||
|
|
53 | 54 | if @custom_field.is_a? IssueCustomField |
|
|
54 | 55 | @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : [] |
|
|
55 | 56 | end |
|
|
56 |
flash[:notice] = |
|
|
|
57 | flash[:notice] = l(:notice_successful_update) | |
|
|
57 | 58 | redirect_to :action => 'list' |
|
|
58 | 59 | end |
|
|
59 | 60 | @trackers = Tracker.find(:all) |
| @@ -25,7 +25,7 class DocumentsController < ApplicationController | |||
|
|
25 | 25 | def edit |
|
|
26 | 26 | @categories = Enumeration::get_values('DCAT') |
|
|
27 | 27 | if request.post? and @document.update_attributes(params[:document]) |
|
|
28 |
flash[:notice] = |
|
|
|
28 | flash[:notice] = l(:notice_successful_update) | |
|
|
29 | 29 | redirect_to :action => 'show', :id => @document |
|
|
30 | 30 | end |
|
|
31 | 31 | end |
| @@ -21,7 +21,7 class IssueCategoriesController < ApplicationController | |||
|
|
21 | 21 | |
|
|
22 | 22 | def edit |
|
|
23 | 23 | if request.post? and @category.update_attributes(params[:category]) |
|
|
24 |
flash[:notice] = |
|
|
|
24 | flash[:notice] = l(:notice_successful_update) | |
|
|
25 | 25 | redirect_to :controller => 'projects', :action => 'settings', :id => @project |
|
|
26 | 26 | end |
|
|
27 | 27 | end |
| @@ -35,7 +35,7 class IssueStatusesController < ApplicationController | |||
|
|
35 | 35 | def create |
|
|
36 | 36 | @issue_status = IssueStatus.new(params[:issue_status]) |
|
|
37 | 37 | if @issue_status.save |
|
|
38 |
flash[:notice] = |
|
|
|
38 | flash[:notice] = l(:notice_successful_create) | |
|
|
39 | 39 | redirect_to :action => 'list' |
|
|
40 | 40 | else |
|
|
41 | 41 | render :action => 'new' |
| @@ -49,7 +49,7 class IssueStatusesController < ApplicationController | |||
|
|
49 | 49 | def update |
|
|
50 | 50 | @issue_status = IssueStatus.find(params[:id]) |
|
|
51 | 51 | if @issue_status.update_attributes(params[:issue_status]) |
|
|
52 |
flash[:notice] = |
|
|
|
52 | flash[:notice] = l(:notice_successful_update) | |
|
|
53 | 53 | redirect_to :action => 'list' |
|
|
54 | 54 | else |
|
|
55 | 55 | render :action => 'edit' |
| @@ -38,7 +38,7 class IssuesController < ApplicationController | |||
|
|
38 | 38 | @issue.custom_values = @custom_values |
|
|
39 | 39 | @issue.attributes = params[:issue] |
|
|
40 | 40 | if @issue.save |
|
|
41 |
flash[:notice] = |
|
|
|
41 | flash[:notice] = l(:notice_successful_update) | |
|
|
42 | 42 | redirect_to :action => 'show', :id => @issue |
|
|
43 | 43 | end |
|
|
44 | 44 | end |
| @@ -56,7 +56,7 class IssuesController < ApplicationController | |||
|
|
56 | 56 | @issue.fixed_version_id = (params[:issue][:fixed_version_id]) |
|
|
57 | 57 | @issue.assigned_to_id = (params[:issue][:assigned_to_id]) |
|
|
58 | 58 | if @issue.save |
|
|
59 |
flash[:notice] = |
|
|
|
59 | flash[:notice] = l(:notice_successful_update) | |
|
|
60 | 60 | Mailer.deliver_issue_change_status(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled? |
|
|
61 | 61 | redirect_to :action => 'show', :id => @issue |
|
|
62 | 62 | end |
| @@ -21,14 +21,14 class MembersController < ApplicationController | |||
|
|
21 | 21 | |
|
|
22 | 22 | def edit |
|
|
23 | 23 | if request.post? and @member.update_attributes(params[:member]) |
|
|
24 |
flash[:notice] = |
|
|
|
24 | flash[:notice] = l(:notice_successful_update) | |
|
|
25 | 25 | redirect_to :controller => 'projects', :action => 'settings', :id => @project |
|
|
26 | 26 | end |
|
|
27 | 27 | end |
|
|
28 | 28 | |
|
|
29 | 29 | def destroy |
|
|
30 | 30 | @member.destroy |
|
|
31 |
flash[:notice] = |
|
|
|
31 | flash[:notice] = l(:notice_successful_delete) | |
|
|
32 | 32 | redirect_to :controller => 'projects', :action => 'settings', :id => @project |
|
|
33 | 33 | end |
|
|
34 | 34 | |
| @@ -24,7 +24,7 class NewsController < ApplicationController | |||
|
|
24 | 24 | |
|
|
25 | 25 | def edit |
|
|
26 | 26 | if request.post? and @news.update_attributes(params[:news]) |
|
|
27 |
flash[:notice] = |
|
|
|
27 | flash[:notice] = l(:notice_successful_update) | |
|
|
28 | 28 | redirect_to :action => 'show', :id => @news |
|
|
29 | 29 | end |
|
|
30 | 30 | end |
| @@ -58,7 +58,7 class ProjectsController < ApplicationController | |||
|
|
58 | 58 | @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) } |
|
|
59 | 59 | @project.custom_values = @custom_values |
|
|
60 | 60 | if @project.save |
|
|
61 |
flash[:notice] = |
|
|
|
61 | flash[:notice] = l(:notice_successful_create) | |
|
|
62 | 62 | redirect_to :controller => 'admin', :action => 'projects' |
|
|
63 | 63 | end |
|
|
64 | 64 | end |
| @@ -92,7 +92,7 class ProjectsController < ApplicationController | |||
|
|
92 | 92 | @project.custom_values = @custom_values |
|
|
93 | 93 | end |
|
|
94 | 94 | if @project.update_attributes(params[:project]) |
|
|
95 |
flash[:notice] = |
|
|
|
95 | flash[:notice] = l(:notice_successful_update) | |
|
|
96 | 96 | redirect_to :action => 'settings', :id => @project |
|
|
97 | 97 | else |
|
|
98 | 98 | settings |
| @@ -114,6 +114,7 class ProjectsController < ApplicationController | |||
|
|
114 | 114 | if request.post? |
|
|
115 | 115 | @issue_category = @project.issue_categories.build(params[:issue_category]) |
|
|
116 | 116 | if @issue_category.save |
|
|
117 | flash[:notice] = l(:notice_successful_create) | |
|
|
117 | 118 | redirect_to :action => 'settings', :id => @project |
|
|
118 | 119 | else |
|
|
119 | 120 | settings |
| @@ -126,6 +127,7 class ProjectsController < ApplicationController | |||
|
|
126 | 127 | def add_version |
|
|
127 | 128 | @version = @project.versions.build(params[:version]) |
|
|
128 | 129 | if request.post? and @version.save |
|
|
130 | flash[:notice] = l(:notice_successful_create) | |
|
|
129 | 131 | redirect_to :action => 'settings', :id => @project |
|
|
130 | 132 | end |
|
|
131 | 133 | end |
| @@ -135,7 +137,7 class ProjectsController < ApplicationController | |||
|
|
135 | 137 | @member = @project.members.build(params[:member]) |
|
|
136 | 138 | if request.post? |
|
|
137 | 139 | if @member.save |
|
|
138 |
flash[:notice] = |
|
|
|
140 | flash[:notice] = l(:notice_successful_create) | |
|
|
139 | 141 | redirect_to :action => 'settings', :id => @project |
|
|
140 | 142 | else |
|
|
141 | 143 | settings |
| @@ -160,6 +162,7 class ProjectsController < ApplicationController | |||
|
|
160 | 162 | @attachment.author_id = self.logged_in_user.id if self.logged_in_user |
|
|
161 | 163 | end |
|
|
162 | 164 | if @document.save |
|
|
165 | flash[:notice] = l(:notice_successful_create) | |
|
|
163 | 166 | redirect_to :action => 'list_documents', :id => @project |
|
|
164 | 167 | end |
|
|
165 | 168 | end |
| @@ -188,7 +191,7 class ProjectsController < ApplicationController | |||
|
|
188 | 191 | @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) } |
|
|
189 | 192 | @issue.custom_values = @custom_values |
|
|
190 | 193 | if @issue.save |
|
|
191 |
flash[:notice] = |
|
|
|
194 | flash[:notice] = l(:notice_successful_create) | |
|
|
192 | 195 | Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled? |
|
|
193 | 196 | redirect_to :action => 'list_issues', :id => @project |
|
|
194 | 197 | end |
| @@ -243,6 +246,7 class ProjectsController < ApplicationController | |||
|
|
243 | 246 | @news.attributes = params[:news] |
|
|
244 | 247 | @news.author_id = self.logged_in_user.id if self.logged_in_user |
|
|
245 | 248 | if @news.save |
|
|
249 | flash[:notice] = l(:notice_successful_create) | |
|
|
246 | 250 | redirect_to :action => 'list_news', :id => @project |
|
|
247 | 251 | end |
|
|
248 | 252 | end |
| @@ -260,6 +264,7 class ProjectsController < ApplicationController | |||
|
|
260 | 264 | @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment]) |
|
|
261 | 265 | @attachment.author_id = self.logged_in_user.id if self.logged_in_user |
|
|
262 | 266 | if @attachment.save |
|
|
267 | flash[:notice] = l(:notice_successful_create) | |
|
|
263 | 268 | redirect_to :controller => 'projects', :action => 'list_files', :id => @project |
|
|
264 | 269 | end |
|
|
265 | 270 | end |
| @@ -285,8 +290,7 private | |||
|
|
285 | 290 | # used as a before_filter |
|
|
286 | 291 | def find_project |
|
|
287 | 292 | @project = Project.find(params[:id]) |
|
|
288 | rescue | |
|
|
289 | flash[:notice] = 'Project not found.' | |
|
|
293 | rescue | |
|
|
290 | 294 | redirect_to :action => 'list' |
|
|
291 | 295 | end |
|
|
292 | 296 | end |
| @@ -33,7 +33,7 class RolesController < ApplicationController | |||
|
|
33 | 33 | if request.post? |
|
|
34 | 34 | @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids] |
|
|
35 | 35 | if @role.save |
|
|
36 |
flash[:notice] = |
|
|
|
36 | flash[:notice] = l(:notice_successful_create) | |
|
|
37 | 37 | redirect_to :action => 'list' |
|
|
38 | 38 | end |
|
|
39 | 39 | end |
| @@ -45,7 +45,7 class RolesController < ApplicationController | |||
|
|
45 | 45 | if request.post? and @role.update_attributes(params[:role]) |
|
|
46 | 46 | @role.permissions = Permission.find(@params[:permission_ids] || []) |
|
|
47 | 47 | Permission.allowed_to_role_expired |
|
|
48 |
flash[:notice] = |
|
|
|
48 | flash[:notice] = l(:notice_successful_update) | |
|
|
49 | 49 | redirect_to :action => 'list' |
|
|
50 | 50 | end |
|
|
51 | 51 | @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC') |
| @@ -73,7 +73,7 class RolesController < ApplicationController | |||
|
|
73 | 73 | } |
|
|
74 | 74 | } |
|
|
75 | 75 | if @role.save |
|
|
76 |
flash[:notice] = |
|
|
|
76 | flash[:notice] = l(:notice_successful_update) | |
|
|
77 | 77 | end |
|
|
78 | 78 | end |
|
|
79 | 79 | @roles = Role.find_all |
| @@ -16,8 +16,8 | |||
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | class TrackersController < ApplicationController |
|
|
19 |
|
|
|
|
20 |
|
|
|
|
19 | layout 'base' | |
|
|
20 | before_filter :require_admin | |
|
|
21 | 21 | |
|
|
22 | 22 | def index |
|
|
23 | 23 | list |
| @@ -34,7 +34,7 class TrackersController < ApplicationController | |||
|
|
34 | 34 | def new |
|
|
35 | 35 | @tracker = Tracker.new(params[:tracker]) |
|
|
36 | 36 | if request.post? and @tracker.save |
|
|
37 |
flash[:notice] = |
|
|
|
37 | flash[:notice] = l(:notice_successful_create) | |
|
|
38 | 38 | redirect_to :action => 'list' |
|
|
39 | 39 | end |
|
|
40 | 40 | end |
| @@ -42,7 +42,7 class TrackersController < ApplicationController | |||
|
|
42 | 42 | def edit |
|
|
43 | 43 | @tracker = Tracker.find(params[:id]) |
|
|
44 | 44 | if request.post? and @tracker.update_attributes(params[:tracker]) |
|
|
45 |
flash[:notice] = |
|
|
|
45 | flash[:notice] = l(:notice_successful_update) | |
|
|
46 | 46 | redirect_to :action => 'list' |
|
|
47 | 47 | end |
|
|
48 | 48 | end |
| @@ -53,7 +53,7 class UsersController < ApplicationController | |||
|
|
53 | 53 | @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) } |
|
|
54 | 54 | @user.custom_values = @custom_values |
|
|
55 | 55 | if @user.save |
|
|
56 |
flash[:notice] = |
|
|
|
56 | flash[:notice] = l(:notice_successful_create) | |
|
|
57 | 57 | redirect_to :action => 'list' |
|
|
58 | 58 | end |
|
|
59 | 59 | end |
| @@ -72,7 +72,7 class UsersController < ApplicationController | |||
|
|
72 | 72 | @user.custom_values = @custom_values |
|
|
73 | 73 | end |
|
|
74 | 74 | if @user.update_attributes(params[:user]) |
|
|
75 |
flash[:notice] = |
|
|
|
75 | flash[:notice] = l(:notice_successful_update) | |
|
|
76 | 76 | redirect_to :action => 'list' |
|
|
77 | 77 | end |
|
|
78 | 78 | end |
| @@ -16,41 +16,42 | |||
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | class VersionsController < ApplicationController |
|
|
19 |
|
|
|
|
20 |
|
|
|
|
21 | ||
|
|
22 |
|
|
|
|
23 |
|
|
|
|
24 |
flash[:notice] = |
|
|
|
19 | layout 'base' | |
|
|
20 | before_filter :find_project, :authorize | |
|
|
21 | ||
|
|
22 | def edit | |
|
|
23 | if request.post? and @version.update_attributes(params[:version]) | |
|
|
24 | flash[:notice] = l(:notice_successful_update) | |
|
|
25 | 25 | redirect_to :controller => 'projects', :action => 'settings', :id => @project |
|
|
26 | end | |
|
|
27 |
|
|
|
|
28 | ||
|
|
29 |
|
|
|
|
30 |
|
|
|
|
31 |
|
|
|
|
26 | end | |
|
|
27 | end | |
|
|
28 | ||
|
|
29 | def destroy | |
|
|
30 | @version.destroy | |
|
|
31 | redirect_to :controller => 'projects', :action => 'settings', :id => @project | |
|
|
32 | 32 | rescue |
|
|
33 | 33 | flash[:notice] = "Unable to delete version" |
|
|
34 |
|
|
|
|
35 |
|
|
|
|
36 | ||
|
|
34 | redirect_to :controller => 'projects', :action => 'settings', :id => @project | |
|
|
35 | end | |
|
|
36 | ||
|
|
37 | 37 | def download |
|
|
38 | 38 | @attachment = @version.attachments.find(params[:attachment_id]) |
|
|
39 | 39 | @attachment.increment_download |
|
|
40 | 40 | send_file @attachment.diskfile, :filename => @attachment.filename |
|
|
41 | 41 | rescue |
|
|
42 | flash[:notice]="Requested file doesn't exist or has been deleted." | |
|
|
42 | flash[:notice] = l(:notice_file_not_found) | |
|
|
43 | 43 | redirect_to :controller => 'projects', :action => 'list_files', :id => @project |
|
|
44 | 44 | end |
|
|
45 | 45 | |
|
|
46 | 46 | def destroy_file |
|
|
47 | 47 | @version.attachments.find(params[:attachment_id]).destroy |
|
|
48 | flash[:notice] = l(:notice_successful_delete) | |
|
|
48 | 49 | redirect_to :controller => 'projects', :action => 'list_files', :id => @project |
|
|
49 | 50 | end |
|
|
50 | 51 | |
|
|
51 | 52 | private |
|
|
52 |
|
|
|
|
53 | def find_project | |
|
|
53 | 54 | @version = Version.find(params[:id]) |
|
|
54 |
|
|
|
|
55 |
|
|
|
|
55 | @project = @version.project | |
|
|
56 | end | |
|
|
56 | 57 | end |
| @@ -92,6 +92,6 module ApplicationHelper | |||
|
|
92 | 92 | end |
|
|
93 | 93 | |
|
|
94 | 94 | def lang_options_for_select |
|
|
95 | GLoc.valid_languages.collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]} | |
|
|
95 | (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]} | |
|
|
96 | 96 | end |
|
|
97 | 97 | end |
| @@ -20,24 +20,27 module CustomFieldsHelper | |||
|
|
20 | 20 | def custom_field_tag(custom_value) |
|
|
21 | 21 | custom_field = custom_value.custom_field |
|
|
22 | 22 | field_name = "custom_fields[#{custom_field.id}]" |
|
|
23 | field_id = "custom_fields_#{custom_field.id}" | |
|
|
24 | ||
|
|
23 | 25 | case custom_field.field_format |
|
|
24 | 26 | when "string", "int", "date" |
|
|
25 | text_field_tag field_name, custom_value.value | |
|
|
27 | text_field_tag field_name, custom_value.value, :id => field_id | |
|
|
26 | 28 | when "text" |
|
|
27 | text_area_tag field_name, custom_value.value, :cols => 60, :rows => 3 | |
|
|
29 | text_area_tag field_name, custom_value.value, :id => field_id, :cols => 60, :rows => 3 | |
|
|
28 | 30 | when "bool" |
|
|
29 | check_box_tag(field_name, "1", custom_value.value == "1") + | |
|
|
31 | check_box_tag(field_name, "1", custom_value.value == "1", :id => field_id) + | |
|
|
30 | 32 | hidden_field_tag(field_name, "0") |
|
|
31 | 33 | when "list" |
|
|
32 | 34 | select_tag field_name, |
|
|
33 | 35 | "<option></option>" + options_for_select(custom_field.possible_values.split('|'), |
|
|
34 | custom_value.value) | |
|
|
36 | custom_value.value), :id => field_id | |
|
|
35 | 37 | end |
|
|
36 | 38 | end |
|
|
37 | 39 | |
|
|
38 | 40 | def custom_field_label_tag(custom_value) |
|
|
39 | 41 | content_tag "label", custom_value.custom_field.name + |
|
|
40 | (custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : "") | |
|
|
42 | (custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""), | |
|
|
43 | :for => "custom_fields_#{custom_value.custom_field.id}" | |
|
|
41 | 44 | end |
|
|
42 | 45 | |
|
|
43 | 46 | def custom_field_tag_with_label(custom_value) |
| @@ -9,7 +9,7 | |||
|
|
9 | 9 | <div class="splitcontentleft"> |
|
|
10 | 10 | <div class="box"> |
|
|
11 | 11 | <h3><%=l(:label_information_plural)%></h3> |
|
|
12 | | |
|
|
12 | ||
|
|
13 | 13 | <%= start_form_tag :action => 'my_account' %> |
|
|
14 | 14 | |
|
|
15 | 15 | <!--[form:user]--> |
| @@ -20,7 +20,7 | |||
|
|
20 | 20 | <%= text_field 'user', 'lastname' %></p> |
|
|
21 | 21 | |
|
|
22 | 22 | <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label><br/> |
|
|
23 | <%= text_field 'user', 'mail' %></p> | |
|
|
23 | <%= text_field 'user', 'mail', :size => 40 %></p> | |
|
|
24 | 24 | |
|
|
25 | 25 | <p><label for="user_language"><%=l(:field_language)%></label><br/> |
|
|
26 | 26 | <%= select("user", "language", lang_options_for_select) %></p> |
| @@ -38,7 +38,7 | |||
|
|
38 | 38 | <% unless @user.auth_source_id %> |
|
|
39 | 39 | <div class="box"> |
|
|
40 | 40 | <h3><%=l(:field_password)%></h3> |
|
|
41 | | |
|
|
41 | ||
|
|
42 | 42 | <%= start_form_tag :action => 'change_password' %> |
|
|
43 | 43 | |
|
|
44 | 44 | <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label><br/> |
| @@ -3,10 +3,19 | |||
|
|
3 | 3 | <p><%=l(:text_select_mail_notifications)%></p> |
|
|
4 | 4 | |
|
|
5 | 5 | <%= start_form_tag ({}, :id => 'mail_options_form')%> |
|
|
6 | <% for action in @actions %> | |
|
|
7 | <%= check_box_tag "action_ids[]", action.id, action.mail_enabled? %> | |
|
|
8 | <%= action.description %><br /> | |
|
|
6 | ||
|
|
7 | <% actions = @actions.group_by {|p| p.group_id } %> | |
|
|
8 | <% actions.keys.sort.each do |group_id| %> | |
|
|
9 | <fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend> | |
|
|
10 | <% actions[group_id].each do |p| %> | |
|
|
11 | <div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %> | |
|
|
12 | <%= l(p.description.to_sym) %> | |
|
|
13 | </div> | |
|
|
14 | <% end %> | |
|
|
15 | </fieldset> | |
|
|
9 | 16 | <% end %> |
|
|
17 | ||
|
|
18 | ||
|
|
10 | 19 | <br /> |
|
|
11 | 20 | <p> |
|
|
12 | 21 | <a href="javascript:checkAll('mail_options_form', true)"><%=l(:button_check_all)%></a> | |
| @@ -56,11 +56,9 | |||
|
|
56 | 56 | <div class="box"> |
|
|
57 | 57 | <h3><%=l(:label_news_latest)%></h3> |
|
|
58 | 58 | <% for news in @news %> |
|
|
59 | <p> | |
|
|
60 | <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br /> | |
|
|
59 | <p><b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br /> | |
|
|
61 | 60 | <%= news.summary %> |
|
|
62 | <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small> | |
|
|
63 | </p> | |
|
|
61 | <small>[<%= link_to l(:label_read), :controller => 'news', :action => 'show', :id => news %>]</small></p> | |
|
|
64 | 62 | <hr /> |
|
|
65 | 63 | <% end %> |
|
|
66 | 64 | <center><small>[ <%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center> |
| @@ -32,16 +32,16 activerecord_error_wrong_length: is the wrong length | |||
|
|
32 | 32 | activerecord_error_taken: has already been taken |
|
|
33 | 33 | activerecord_error_not_a_number: is not a number |
|
|
34 | 34 | |
|
|
35 |
general_fmt_age: %d |
|
|
|
36 |
general_fmt_age_plural: %d |
|
|
|
37 |
general_fmt_date: %% |
|
|
|
38 |
general_fmt_datetime: %% |
|
|
|
39 |
general_fmt_datetime_short: %% |
|
|
|
40 |
general_fmt_time: %% |
|
|
|
35 | general_fmt_age: %d año | |
|
|
36 | general_fmt_age_plural: %d años | |
|
|
37 | general_fmt_date: %%d/%%m/%%Y | |
|
|
38 | general_fmt_datetime: %%d/%%m/%%Y %%H:%%M | |
|
|
39 | general_fmt_datetime_short: %%d/%%m %%H:%%M | |
|
|
40 | general_fmt_time: %%H:%%M | |
|
|
41 | 41 | general_text_No: 'No' |
|
|
42 |
general_text_Yes: ' |
|
|
|
42 | general_text_Yes: 'Sí' | |
|
|
43 | 43 | general_text_no: 'no' |
|
|
44 |
general_text_yes: ' |
|
|
|
44 | general_text_yes: 'sí' | |
|
|
45 | 45 | general_lang_es: 'Español' |
|
|
46 | 46 | |
|
|
47 | 47 | notice_account_updated: Account was successfully updated. |
| @@ -60,7 +60,7 notice_successful_connection: Successful connection. | |||
|
|
60 | 60 | notice_file_not_found: Requested file doesn't exist or has been deleted. |
|
|
61 | 61 | |
|
|
62 | 62 | gui_validation_error: 1 error |
|
|
63 | gui_validation_error_plural: %d errors | |
|
|
63 | gui_validation_error_plural: %d errores | |
|
|
64 | 64 | |
|
|
65 | 65 | field_name: Nombre |
|
|
66 | 66 | field_description: Descripción |
| @@ -70,12 +70,12 field_firstname: Nombre | |||
|
|
70 | 70 | field_lastname: Apellido |
|
|
71 | 71 | field_mail: Email |
|
|
72 | 72 | field_filename: Fichero |
|
|
73 |
|
|
|
|
73 | field_filesize: Tamaño | |
|
|
74 | 74 | field_downloads: Telecargas |
|
|
75 | 75 | field_author: Autor |
|
|
76 | 76 | field_created_on: Creado |
|
|
77 | 77 | field_updated_on: Actualizado |
|
|
78 |
|
|
|
|
78 | field_field_format: Formato | |
|
|
79 | 79 | field_is_for_all: Para todos los proyectos |
|
|
80 | 80 | field_possible_values: Valores posibles |
|
|
81 | 81 | field_regexp: Expresión regular |
| @@ -87,7 +87,7 field_title: Título | |||
|
|
87 | 87 | field_project: Proyecto |
|
|
88 | 88 | field_issue: Petición |
|
|
89 | 89 | field_status: Estatuto |
|
|
90 |
|
|
|
|
90 | field_notes: Notas | |
|
|
91 | 91 | field_is_closed: Petición resuelta |
|
|
92 | 92 | field_is_default: Estatuto por defecto |
|
|
93 | 93 | field_html_color: Color |
| @@ -165,7 +165,7 label_information: Informacion | |||
|
|
165 | 165 | label_information_plural: Informaciones |
|
|
166 | 166 | label_please_login: Conexión |
|
|
167 | 167 | #label_register: Register |
|
|
168 |
|
|
|
|
168 | label_password_lost: ¿Olvidaste la contraseña? | |
|
|
169 | 169 | label_home: Acogida |
|
|
170 | 170 | label_my_page: Mi página |
|
|
171 | 171 | label_my_account: Mi cuenta |
| @@ -222,7 +222,7 label_version: Versión | |||
|
|
222 | 222 | label_version_new: Nueva versión |
|
|
223 | 223 | label_version_plural: Versiónes |
|
|
224 | 224 | label_confirmation: Confirmación |
|
|
225 |
|
|
|
|
225 | label_export_csv: Exportar a CSV | |
|
|
226 | 226 | label_read: Leer... |
|
|
227 | 227 | label_public_projects: Proyectos publicos |
|
|
228 | 228 | label_open_issues: Abierta |
| @@ -265,9 +265,9 text_min_max_length_info: 0 para ninguna restricción | |||
|
|
265 | 265 | text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ? |
|
|
266 | 266 | text_workflow_edit: Seleccionar un workflow para actualizar |
|
|
267 | 267 | |
|
|
268 |
|
|
|
|
269 |
|
|
|
|
270 |
|
|
|
|
268 | default_role_manager: Manager | |
|
|
269 | default_role_developper: Desarrollador | |
|
|
270 | default_role_reporter: Informador | |
|
|
271 | 271 | default_tracker_bug: Anomalía |
|
|
272 | 272 | default_tracker_feature: Evolución |
|
|
273 | 273 | default_tracker_support: Asistencia |
| @@ -150,7 +150,7 background-color:inherit; | |||
|
|
150 | 150 | } |
|
|
151 | 151 | |
|
|
152 | 152 | #content h2 a{font-weight:normal;} |
|
|
153 |
#content h3{margin:0 0 |
|
|
|
153 | #content h3{margin:0 0 12px 0; font-size:1.4em; letter-spacing:-1px;} | |
|
|
154 | 154 | #content a:hover,#subcontent a:hover{text-decoration:underline;} |
|
|
155 | 155 | #content ul,#content ol{margin:0 5px 16px 35px;} |
|
|
156 | 156 | #content dl{margin:0 5px 10px 25px;} |
| @@ -255,7 +255,7 tr.even { | |||
|
|
255 | 255 | background-color:#CEE1ED; |
|
|
256 | 256 | } |
|
|
257 | 257 | |
|
|
258 |
hr { border: |
|
|
|
258 | hr { border:none; border-bottom: dotted 2px #c0c0c0; } | |
|
|
259 | 259 | |
|
|
260 | 260 | |
|
|
261 | 261 | /**************** Sidebar styles ****************/ |
| @@ -39,10 +39,15 class AccountTest < ActionController::IntegrationTest | |||
|
|
39 | 39 | |
|
|
40 | 40 | post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2" |
|
|
41 | 41 | assert_response :success |
|
|
42 | assert_template "account/my_account" | |
|
|
42 | 43 | assert_tag :tag => "div", :attributes => { :class => "errorExplanation" } |
|
|
43 | ||
|
|
44 | ||
|
|
45 | post "account/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello" | |
|
|
46 | assert_redirected_to "account/my_account" | |
|
|
47 | assert_equal 'Wrong password', flash[:notice] | |
|
|
48 | ||
|
|
44 | 49 | post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello" |
|
|
45 | assert_response :success | |
|
|
50 | assert_redirected_to "account/my_account" | |
|
|
46 | 51 | log_user('jsmith', 'hello') |
|
|
47 | 52 | end |
|
|
48 | 53 | |
| @@ -47,7 +47,7 class AdminTest < ActionController::IntegrationTest | |||
|
|
47 | 47 | assert_template "projects/add" |
|
|
48 | 48 | post "projects/add", :project => { :name => "blog", :description => "weblog", :is_public => 1} |
|
|
49 | 49 | assert_redirected_to "admin/projects" |
|
|
50 |
assert_equal ' |
|
|
|
50 | assert_equal 'Successful creation.', flash[:notice] | |
|
|
51 | 51 | |
|
|
52 | 52 | project = Project.find_by_name("blog") |
|
|
53 | 53 | assert_kind_of Project, project |
General Comments 0
You need to be logged in to leave comments.
Login now