Changeset - f5dd76e2a7af
Parent rev.
Child rev.
[Not reviewed]
beta
0 5 0
Marcin Kuzminski - 13 years ago 2013-01-27 00:18:49
marcin@python-works.com
disable file editing when not on branch head fixes issue #462
5 files changed with 39 insertions and 13 deletions:
rhodecode/controllers/files.py
20
8
rhodecode/public/css/style.css
13
1
rhodecode/templates/files/files_add.html
1
1
rhodecode/templates/files/files_edit.html
1
1
rhodecode/templates/files/files_source.html
4
2
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -119,24 +119,25 @@ class FilesController(BaseRepoController
 
    def index(self, repo_name, revision, f_path, annotate=False):
 
        # redirect to given revision from form if given
 
        post_revision = request.POST.get('at_rev', None)
 
        if post_revision:
 
            cs = self.__get_cs_or_redirect(post_revision, repo_name)
 
            redirect(url('files_home', repo_name=c.repo_name,
 
                         revision=cs.raw_id, f_path=f_path))
 

			




	
	
	
		
 
        c.changeset = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        c.branch = request.GET.get('branch', None)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        c.annotate = annotate

			




	
	
	
		
 
        c.changeset = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        cur_rev = c.changeset.revision

			




	
	
	
		
 

			




	
	
	
		
 
        # prev link

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            prev_rev = c.rhodecode_repo.get_changeset(cur_rev).prev(c.branch)

			




	
	
	
		
 
            c.url_prev = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                         revision=prev_rev.raw_id, f_path=f_path)

			




	
	
	
		
 
            if c.branch:

			




	
	
	
		
 
                c.url_prev += '?branch=%s' % c.branch

			




	
	
	
		
 
        except (ChangesetDoesNotExistError, VCSError):

			




	
	
	
		
 
            c.url_prev = '#'

			




	
	
	
		
 

			




	
	
		
 
@@ -151,24 +152,27 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
            c.url_next = '#'

			




	
	
	
		
 

			




	
	
	
		
 
        # files or dirs

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            c.file = c.changeset.get_node(f_path)

			




	
	
	
		
 

			




	
	
	
		
 
            if c.file.is_file():

			




	
	
	
		
 
                c.load_full_history = False

			




	
	
	
		
 
                file_last_cs = c.file.last_changeset

			




	
	
	
		
 
                c.file_changeset = (c.changeset

			




	
	
	
		
 
                                    if c.changeset.revision < file_last_cs.revision

			




	
	
	
		
 
                                    else file_last_cs)

			




	
	
	
		
 
                #determine if we're on branch head

			




	
	
	
		
 
                _branches = c.rhodecode_repo.branches

			




	
	
	
		
 
                c.on_branch_head = revision in _branches.keys() + _branches.values() 

			




	
	
	
		
 
                _hist = []

			




	
	
	
		
 
                c.file_history = []

			




	
	
	
		
 
                if c.load_full_history:

			




	
	
	
		
 
                    c.file_history, _hist = self._get_node_history(c.changeset, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
                c.authors = []

			




	
	
	
		
 
                for a in set([x.author for x in _hist]):

			




	
	
	
		
 
                    c.authors.append((h.email(a), h.person(a)))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.authors = c.file_history = []

			




	
	
	
		
 
        except RepositoryError, e:

			




	
	
	
		
 
            h.flash(str(e), category='warning')

			




	
	
		
 
@@ -251,63 +255,72 @@ class FilesController(BaseRepoController

			




	
	
	
		
 

			




	
	
	
		
 
        if dispo == 'attachment':

			




	
	
	
		
 
            dispo = 'attachment; filename=%s' % \

			




	
	
	
		
 
                        safe_str(f_path.split(os.sep)[-1])

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_disposition = dispo

			




	
	
	
		
 
        response.content_type = mimetype

			




	
	
	
		
 
        return file_node.content

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')

			




	
	
	
		
 
    def edit(self, repo_name, revision, f_path):

			




	
	
	
		
 
        repo = Repository.get_by_repo_name(repo_name)

			




	
	
	
		
 
        repo = c.rhodecode_db_repo

			




	
	
	
		
 
        if repo.enable_locking and repo.locked[0]:

			




	
	
	
		
 
            h.flash(_('This repository is has been locked by %s on %s')

			




	
	
	
		
 
                % (h.person_by_id(repo.locked[0]),

			




	
	
	
		
 
                   h.fmt_date(h.time_to_datetime(repo.locked[1]))),

			




	
	
	
		
 
                  'warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        # check if revision is a branch identifier- basically we cannot

			




	
	
	
		
 
        # create multiple heads via file editing

			




	
	
	
		
 
        _branches = repo.scm_instance.branches

			




	
	
	
		
 
        # check if revision is a branch name or branch hash

			




	
	
	
		
 
        if revision not in _branches.keys() + _branches.values():

			




	
	
	
		
 
            h.flash(_('You can only edit files with revision '

			




	
	
	
		
 
                      'being a valid branch '), category='warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip',

			




	
	
	
		
 
                                  f_path=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.default_message = _('Edited file %s via RhodeCode') % (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)

			




	
	
	
		
 

			




	
	
	
		
 
            message = r_post.get('message') or (_('Edited %s via RhodeCode')

			




	
	
	
		
 
                                                % (f_path))

			




	
	
	
		
 
            message = r_post.get('message') or c.default_message

			




	
	
	
		
 
            author = self.rhodecode_user.full_contact

			




	
	
	
		
 

			




	
	
	
		
 
            if content == old_content:

			




	
	
	
		
 
                h.flash(_('No changes'),

			




	
	
	
		
 
                    category='warning')

			




	
	
	
		
 
                return redirect(url('changeset_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                    revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                self.scm_model.commit_change(repo=c.rhodecode_repo,

			




	
	
	
		
 
                                             repo_name=repo_name, cs=c.cs,

			




	
	
	
		
 
                                             user=self.rhodecode_user,

			




	
	
	
		
 
                                             author=author, message=message,

			




	
	
	
		
 
                                             content=content, f_path=f_path)

			




	
	
	
		
 
                h.flash(_('Successfully committed to %s') % f_path,

			




	
	
	
		
 
                        category='success')

			




	
	
	
		
 

			




	
	
	
		
 
            except Exception:

			




	
	
	
		
 
                log.error(traceback.format_exc())

			




	
	
	
		
 
                h.flash(_('Error occurred during commit'), category='error')

			




	
	
		
 
@@ -325,33 +338,32 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
            h.flash(_('This repository is has been locked by %s on %s')

			




	
	
	
		
 
                % (h.person_by_id(repo.locked[0]),

			




	
	
	
		
 
                   h.fmt_date(h.time_to_datetime(repo.locked[1]))),

			




	
	
	
		
 
                  'warning')

			




	
	
	
		
 
            return redirect(h.url('files_home',

			




	
	
	
		
 
                                  repo_name=repo_name, revision='tip'))

			




	
	
	
		
 

			




	
	
	
		
 
        r_post = request.POST

			




	
	
	
		
 
        c.cs = self.__get_cs_or_redirect(revision, repo_name,

			




	
	
	
		
 
                                         redirect_after=False)

			




	
	
	
		
 
        if c.cs is None:

			




	
	
	
		
 
            c.cs = EmptyChangeset(alias=c.rhodecode_repo.alias)

			




	
	
	
		
 

			




	
	
	
		
 
        c.default_message = (_('Added file via RhodeCode'))

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 

			




	
	
	
		
 
        if r_post:

			




	
	
	
		
 
            unix_mode = 0

			




	
	
	
		
 
            content = convert_line_endings(r_post.get('content'), unix_mode)

			




	
	
	
		
 

			




	
	
	
		
 
            message = r_post.get('message') or (_('Added %s via RhodeCode')

			




	
	
	
		
 
                                                % (f_path))

			




	
	
	
		
 
            message = r_post.get('message') or c.default_message

			




	
	
	
		
 
            location = r_post.get('location')

			




	
	
	
		
 
            filename = r_post.get('filename')

			




	
	
	
		
 
            file_obj = r_post.get('upload_file', None)

			




	
	
	
		
 

			




	
	
	
		
 
            if file_obj is not None and hasattr(file_obj, 'filename'):

			




	
	
	
		
 
                filename = file_obj.filename

			




	
	
	
		
 
                content = file_obj.file

			




	
	
	
		
 

			




	
	
	
		
 
            node_path = os.path.join(location, filename)

			




	
	
	
		
 
            author = self.rhodecode_user.full_contact

			




	
	
	
		
 

			




	
	
	
		
 
            if not content:

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3535,54 +3535,66 @@ div.gravatar img {

			




	
	
	
		
 
    color: #515151;

			




	
	
	
		
 
    outline: none;

			




	
	
	
		
 
    margin: 0px 3px 3px 0px;

			




	
	
	
		
 
    -webkit-border-radius: 4px 4px 4px 4px !important;

			




	
	
	
		
 
    -khtml-border-radius: 4px 4px 4px 4px !important;

			




	
	
	
		
 
    -moz-border-radius: 4px 4px 4px 4px !important;

			




	
	
	
		
 
    border-radius: 4px 4px 4px 4px !important;

			




	
	
	
		
 
    cursor: pointer !important;

			




	
	
	
		
 
	padding: 3px 3px 3px 3px;	

			




	
	
	
		
 
	background-position: 0 -15px;

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.disabled{

			




	
	
	
		
 
	color: #999;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.xsmall{

			




	
	
	
		
 
    padding: 1px 2px 1px 1px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.large{

			




	
	
	
		
 
	padding: 6px 12px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.clone{

			




	
	
	
		
 
	padding: 5px 2px 6px 1px;

			




	
	
	
		
 
	margin: 0px -4px 3px 0px;

			




	
	
	
		
 
    -webkit-border-radius: 4px 0px 0px 4px !important;

			




	
	
	
		
 
    -khtml-border-radius: 4px 0px 0px 4px !important;

			




	
	
	
		
 
    -moz-border-radius: 4px 0px 0px 4px !important;

			




	
	
	
		
 
    border-radius: 4px 0px 0px 4px !important;

			




	
	
	
		
 
    width: 100px;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
}

			




	
	
	
		
 
.ui-btn:focus {

			




	
	
	
		
 
  outline: none;

			




	
	
	
		
 
}

			




	
	
	
		
 
.ui-btn:hover{

			




	
	
	
		
 
    background-position: 0 0px;

			




	
	
	
		
 
    background-position: 0 -15px;

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    color: #515151;

			




	
	
	
		
 
    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.disabled:hover{

			




	
	
	
		
 
    background-position:none;

			




	
	
	
		
 
    color: #999;

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    box-shadow: none !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.ui-btn.red{

			




	
	
	
		
 
  color:#fff;

			




	
	
	
		
 
  background-color: #c43c35;

			




	
	
	
		
 
  background-repeat: repeat-x;

			




	
	
	
		
 
  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));

			




	
	
	
		
 
  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));

			




	
	
	
		
 
  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  background-image: linear-gradient(top, #ee5f5b, #c43c35);

			




	
	
	
		
 
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_add.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -66,25 +66,25 @@

			




	
	
	
		
 
                          <input type="text" value="${c.f_path}" size="30" name="location" id="location">

			




	
	
	
		
 
                          ${_('use / to separate directories')}

			




	
	
	
		
 
                      </div>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
                <div id="editor_container">

			




	
	
	
		
 
                    <pre id="editor_pre"></pre>

			




	
	
	
		
 
                    <textarea id="editor" name="content" style="display:none"></textarea>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('commit message')}</div>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px"></textarea>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="text-align: l;padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('commit',_('Commit changes'),class_="ui-btn")}

			




	
	
	
		
 
            ${h.reset('reset',_('Reset'),class_="ui-btn")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
            <script type="text/javascript">

			




	
	
	
		
 
            var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";

			




	
	
	
		
 
            initCodeMirror('editor',reset_url);

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,25 +52,25 @@

			




	
	
	
		
 
                      % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

			




	
	
	
		
 
                       % if not c.file.is_binary:

			




	
	
	
		
 
                        ${h.link_to(_('source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
                       % endif

			




	
	
	
		
 
                      % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="commit">${_('Editing file')}: ${c.file.unicode_path}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <pre id="editor_pre"></pre>

			




	
	
	
		
 
                <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('commit message')}</div>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px"></textarea>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="text-align: left;padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('commit',_('Commit changes'),class_="ui-btn")}

			




	
	
	
		
 
            ${h.reset('reset',_('Reset'),class_="ui-btn")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
            <script type="text/javascript">

			




	
	
	
		
 
            var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}";

			




	
	
	
		
 
            initCodeMirror('editor',reset_url);

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,26 +16,28 @@

			




	
	
	
		
 
            <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div>

			




	
	
	
		
 
            <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>

			




	
	
	
		
 
            <div class="left item last"><pre>${c.file.mimetype}</pre></div>

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
              %if c.annotate:

			




	
	
	
		
 
                ${h.link_to(_('show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
                ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              % 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.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
               % if c.on_branch_head and c.file.is_binary is False:

			




	
	
	
		
 
                ${h.link_to(_('edit on branch:%s' % c.changeset.branch),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
               %else:

			




	
	
	
		
 
                ${h.link_to(_('edit on branch:?'), '#', class_="ui-btn disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}

			




	
	
	
		
 
               % endif

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="author">

			




	
	
	
		
 
            <div class="gravatar">

			




	
	
	
		
 
                <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file_changeset.author),16)}"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
    </div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.