Show More
@@ -32,6 +32,7 b' fixes' | |||||
32 | - default permissions can get duplicated after migration |
|
32 | - default permissions can get duplicated after migration | |
33 | - fixed changeset status labels, they now select radio buttons |
|
33 | - fixed changeset status labels, they now select radio buttons | |
34 | - #682 translation difficult for multi-line text |
|
34 | - #682 translation difficult for multi-line text | |
|
35 | - #683 fixed difference between messages about not mapped repositories | |||
35 |
|
36 | |||
36 | 1.5.0 (**2012-12-12**) |
|
37 | 1.5.0 (**2012-12-12**) | |
37 | ---------------------- |
|
38 | ---------------------- |
@@ -89,12 +89,7 b' class ReposController(BaseController):' | |||||
89 | repo = db_repo.scm_instance |
|
89 | repo = db_repo.scm_instance | |
90 |
|
90 | |||
91 | if c.repo_info is None: |
|
91 | if c.repo_info is None: | |
92 | h.flash(_('%s repository is not mapped to db perhaps' |
|
92 | h.not_mapped_error(repo_name) | |
93 | ' it was created or renamed from the filesystem' |
|
|||
94 | ' please run the application again' |
|
|||
95 | ' in order to rescan repositories') % repo_name, |
|
|||
96 | category='error') |
|
|||
97 |
|
||||
98 | return redirect(url('repos')) |
|
93 | return redirect(url('repos')) | |
99 |
|
94 | |||
100 | ##override defaults for exact repo info here git/hg etc |
|
95 | ##override defaults for exact repo info here git/hg etc | |
@@ -310,12 +305,7 b' class ReposController(BaseController):' | |||||
310 | repo_model = RepoModel() |
|
305 | repo_model = RepoModel() | |
311 | repo = repo_model.get_by_repo_name(repo_name) |
|
306 | repo = repo_model.get_by_repo_name(repo_name) | |
312 | if not repo: |
|
307 | if not repo: | |
313 | h.flash(_('%s repository is not mapped to db perhaps' |
|
308 | h.not_mapped_error(repo_name) | |
314 | ' it was moved or renamed from the filesystem' |
|
|||
315 | ' please run the application again' |
|
|||
316 | ' in order to rescan repositories') % repo_name, |
|
|||
317 | category='error') |
|
|||
318 |
|
||||
319 | return redirect(url('repos')) |
|
309 | return redirect(url('repos')) | |
320 | try: |
|
310 | try: | |
321 | action_logger(self.rhodecode_user, 'admin_deleted_repo', |
|
311 | action_logger(self.rhodecode_user, 'admin_deleted_repo', |
@@ -71,12 +71,7 b' class ForksController(BaseRepoController' | |||||
71 | repo = db_repo.scm_instance |
|
71 | repo = db_repo.scm_instance | |
72 |
|
72 | |||
73 | if c.repo_info is None: |
|
73 | if c.repo_info is None: | |
74 | h.flash(_('%s repository is not mapped to db perhaps' |
|
74 | h.not_mapped_error(repo_name) | |
75 | ' it was created or renamed from the filesystem' |
|
|||
76 | ' please run the application again' |
|
|||
77 | ' in order to rescan repositories') % repo_name, |
|
|||
78 | category='error') |
|
|||
79 |
|
||||
80 | return redirect(url('repos')) |
|
75 | return redirect(url('repos')) | |
81 |
|
76 | |||
82 | c.default_user_id = User.get_by_username('default').user_id |
|
77 | c.default_user_id = User.get_by_username('default').user_id | |
@@ -131,12 +126,7 b' class ForksController(BaseRepoController' | |||||
131 | def fork(self, repo_name): |
|
126 | def fork(self, repo_name): | |
132 | c.repo_info = Repository.get_by_repo_name(repo_name) |
|
127 | c.repo_info = Repository.get_by_repo_name(repo_name) | |
133 | if not c.repo_info: |
|
128 | if not c.repo_info: | |
134 | h.flash(_('%s repository is not mapped to db perhaps' |
|
129 | h.not_mapped_error(repo_name) | |
135 | ' it was created or renamed from the file system' |
|
|||
136 | ' please run the application again' |
|
|||
137 | ' in order to rescan repositories') % repo_name, |
|
|||
138 | category='error') |
|
|||
139 |
|
||||
140 | return redirect(url('home')) |
|
130 | return redirect(url('home')) | |
141 |
|
131 | |||
142 | defaults = self.__load_data(repo_name) |
|
132 | defaults = self.__load_data(repo_name) |
@@ -77,12 +77,7 b' class SettingsController(BaseRepoControl' | |||||
77 | repo = db_repo.scm_instance |
|
77 | repo = db_repo.scm_instance | |
78 |
|
78 | |||
79 | if c.repo_info is None: |
|
79 | if c.repo_info is None: | |
80 | h.flash(_('%s repository is not mapped to db perhaps' |
|
80 | h.not_mapped_error(repo_name) | |
81 | ' it was created or renamed from the filesystem' |
|
|||
82 | ' please run the application again' |
|
|||
83 | ' in order to rescan repositories') % repo_name, |
|
|||
84 | category='error') |
|
|||
85 |
|
||||
86 | return redirect(url('home')) |
|
81 | return redirect(url('home')) | |
87 |
|
82 | |||
88 | ##override defaults for exact repo info here git/hg etc |
|
83 | ##override defaults for exact repo info here git/hg etc | |
@@ -157,12 +152,7 b' class SettingsController(BaseRepoControl' | |||||
157 | repo_model = RepoModel() |
|
152 | repo_model = RepoModel() | |
158 | repo = repo_model.get_by_repo_name(repo_name) |
|
153 | repo = repo_model.get_by_repo_name(repo_name) | |
159 | if not repo: |
|
154 | if not repo: | |
160 | h.flash(_('%s repository is not mapped to db perhaps' |
|
155 | h.not_mapped_error(repo_name) | |
161 | ' it was moved or renamed from the filesystem' |
|
|||
162 | ' please run the application again' |
|
|||
163 | ' in order to rescan repositories') % repo_name, |
|
|||
164 | category='error') |
|
|||
165 |
|
||||
166 | return redirect(url('home')) |
|
156 | return redirect(url('home')) | |
167 | try: |
|
157 | try: | |
168 | action_logger(self.rhodecode_user, 'user_deleted_repo', |
|
158 | action_logger(self.rhodecode_user, 'user_deleted_repo', |
@@ -1157,3 +1157,10 b' def journal_filter_help():' | |||||
1157 | "repository:vcs OR repository:test" |
|
1157 | "repository:vcs OR repository:test" | |
1158 | "username:test AND repository:test*" |
|
1158 | "username:test AND repository:test*" | |
1159 | ''')) |
|
1159 | ''')) | |
|
1160 | ||||
|
1161 | ||||
|
1162 | def not_mapped_error(repo_name): | |||
|
1163 | flash(_('%s repository is not mapped to db perhaps' | |||
|
1164 | ' it was created or renamed from the filesystem' | |||
|
1165 | ' please run the application again' | |||
|
1166 | ' in order to rescan repositories') % repo_name, category='error') |
General Comments 0
You need to be logged in to leave comments.
Login now