kallithea Changeset - 856be614d9a4

Changeset - 856be614d9a4

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-05-04 19:19:00
marcin@python-works.com

disabled edition of binary files

3 files changed with 9 insertions and 1 deletions:

rhodecode/controllers/files.py

rhodecode/templates/files/files_annotate.html

rhodecode/templates/files/files_source.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -212,24 +212,28 @@ class FilesController(BaseRepoController @@
         c.file_history = self._get_node_history(c.cs, f_path)
         c.f_path = f_path
         return render('files/files_annotate.html')
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def edit(self, repo_name, revision, f_path):
         r_post = request.POST
         c.cs = self.__get_cs_or_redirect(revision, repo_name)
         c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)
         if c.file.is_binary:
             return redirect(url('files_home', repo_name=c.repo_name,
                          revision=c.cs.raw_id, f_path=f_path))
         c.file_history = self._get_node_history(c.cs, f_path)
         c.f_path = f_path
         if r_post:
             old_content = c.file.content
             sl = old_content.splitlines(1)
             first_line = sl[0] if sl else ''
             # modes:  0 - Unix, 1 - Mac, 2 - DOS
             mode = detect_mode(first_line, 0)
             content = convert_line_endings(r_post.get('content'), mode)

rhodecode/templates/files/files_annotate.html

➞

Show inline comments

@@ @@ -35,27 +35,29 @@ @@
 						h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))} </dd>
 				<dt>${_('Size')}</dt>
 				<dd>${h.format_byte_size(c.file.size,binary=True)}</dd>
     			<dt>${_('Mimetype')}</dt>
 				<dd>${c.file.mimetype}</dd>
 				<dt>${_('Options')}</dt>
 				<dd>${h.link_to(_('show source'),
 						h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
 					/ ${h.link_to(_('show as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
 					/ ${h.link_to(_('download as raw'),
 						h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
                     % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                     % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                      % if not c.file.is_binary:
                     / ${h.link_to(_('edit'),
                         h.url('files_edit_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}
                      % endif
                     % endif
 				</dd>
 			    <dt>${_('History')}</dt>
 			    <dd>
 			        <div>
 			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}
 			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
 			        ${h.submit('diff','diff to revision',class_="ui-button-small")}
 			        ${h.submit('show_rev','show at revision',class_="ui-button-small")}
 			        ${h.end_form()}
 			        </div>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -7,26 +7,28 @@ @@
 	<dt>${_('Size')}</dt>
 	<dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd>
 	<dt>${_('Mimetype')}</dt>
 	<dd>${c.files_list.mimetype}</dd>
 	<dt>${_('Options')}</dt>
 	<dd>${h.link_to(_('show annotation'),
 			h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		 / ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		 / ${h.link_to(_('download as raw'),
 			h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
         % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
          % if not c.files_list.is_binary:
          / ${h.link_to(_('edit'),
             h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
          % endif
         % endif
 	</dd>
 	<dt>${_('History')}</dt>
 	<dd>
 		<div>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}
 		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}
 		${h.submit('diff','diff to revision',class_="ui-button-small")}
 		${h.submit('show_rev','show at revision',class_="ui-button-small")}
 		${h.end_form()}
 		</div>

0 comments (0 inline, 0 general)