kallithea Changeset - 269905fac50a

Changeset - 269905fac50a

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 14 years ago 2011-09-23 00:52:48
marcin@python-works.com

added uploading of files from web interface directly into repo

6 files changed with 83 insertions and 31 deletions:

rhodecode/controllers/files.py

rhodecode/model/scm.py

rhodecode/public/css/codemirror.css

rhodecode/public/css/style.css

rhodecode/templates/files/files_add.html

rhodecode/templates/files/files_edit.html

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -27,25 +27,25 @@ import os @@
 import logging
 import traceback
 from os.path import join as jn
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 from pylons.decorators import jsonify
 from vcs.conf import settings
 from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
     EmptyRepositoryError, ImproperArchiveTypeError, VCSError
+    EmptyRepositoryError, ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError
 from vcs.nodes import FileNode, NodeKind
 from vcs.utils import diffs as differ
 from rhodecode.lib import convert_line_endings, detect_mode, safe_str
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
 import rhodecode.lib.helpers as h
 from rhodecode.model.repo import RepoModel
 log = logging.getLogger(__name__)
@@ @@ -64,27 +64,27 @@ class FilesController(BaseRepoController @@
         :param rev: revision to fetch
         :param repo_name: repo name to redirect after
         """
         try:
             return c.rhodecode_repo.get_changeset(rev)
         except EmptyRepositoryError, e:
             if not redirect_after:
                 return None
             url_ = url('files_add_home',
                        repo_name=c.repo_name,
                        revision=0,f_path='')
             add_new = '<a href="%s">[%s]</a>' % (url_,_('add new'))
             h.flash(h.literal(_('There are no files yet %s' % add_new)),
                        revision=0, f_path='')
             add_new = '<a href="%s">[%s]</a>' % (url_, _('add new'))
             h.flash(h.literal(_('There are no files yet %s' % add_new)),
                     category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
         except RepositoryError, e:
             h.flash(str(e), category='warning')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
     def __get_filenode_or_redirect(self, repo_name, cs, path):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
@@ @@ -286,60 +286,67 @@ class FilesController(BaseRepoController @@
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))
         return render('files/files_edit.html')
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def add(self, repo_name, revision, f_path):
         r_post = request.POST
-        c.cs = self.__get_cs_or_redirect(revision, repo_name,
         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.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))
             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:
                 h.flash(_('No content'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
             if not filename:
                 h.flash(_('No filename'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
-                                    revision='tip'))
                                     revision='tip'))
             try:
                 self.scm_model.create_node(repo=c.rhodecode_repo,
                                              repo_name=repo_name, cs=c.cs,
                                              user=self.rhodecode_user,
                                              author=author, message=message,
                                              content=content, f_path=node_path)
                 h.flash(_('Successfully committed to %s' % node_path),
                         category='success')
             except NodeAlreadyExistsError, e:
                 h.flash(_(e), category='error')
             except Exception:
                 log.error(traceback.format_exc())
                 h.flash(_('Error occurred during commit'), category='error')
             return redirect(url('changeset_home',
                                 repo_name=c.repo_name, revision='tip'))
         return render('files/files_add.html')
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def archivefile(self, repo_name, fname):

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -351,25 +351,30 @@ class ScmModel(BaseModel): @@
         action_logger(user, action, repo_name)
         self.mark_for_invalidation(repo_name)
     def create_node(self, repo, repo_name, cs, user, author, message, content,
                       f_path):
         if repo.alias == 'hg':
             from vcs.backends.hg import MercurialInMemoryChangeset as IMC
         elif repo.alias == 'git':
             from vcs.backends.git import GitInMemoryChangeset as IMC
         # decoding here will force that we have proper encoded values
         # in any other case this will throw exceptions and deny commit
         content = safe_str(content)
         if isinstance(content,(basestring,)):
             content = safe_str(content)
         elif isinstance(content,file):
             content = content.read()
         message = safe_str(message)
         path = safe_str(f_path)
         author = safe_str(author)
         m = IMC(repo)
         if isinstance(cs, EmptyChangeset):
             # Emptychangeset means we we're editing empty repository
             parents = None
         else:
             parents = [cs]
         m.add(FileNode(path, content=content))

rhodecode/public/css/codemirror.css

➞

Show inline comments

 .CodeMirror {
   overflow: auto;
   height: 450px;
   line-height: 1em;
   font-family: monospace;
   _position: relative; /* IE6 hack */
   margin:20px;
+}
 .CodeMirror-gutter {
   position: absolute; left: 0; top: 0;
   background-color: #f7f7f7;
   border-right: 1px solid #eee;
   min-width: 2em;
   height: 100%;
+}
 .CodeMirror-gutter-text {
   color: #aaa;
   text-align: right;

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -919,41 +919,55 @@ padding:0 0 8px; @@
 #content div.box-left div.form div.fields div.field div.label-textarea,#content div.box-right div.form div.fields div.field div.label-textarea {
 padding:0 0 8px !important;
+}
 #content div.box div.form div.fields div.field div.label label, div.label label{
 color:#393939;
 font-weight:700;
+}
 #content div.box div.form div.fields div.field div.input {
 margin:0 0 0 200px;
+}
 #content div.box div.form div.fields div.field div.file {
 margin:0 0 0 200px;
+}
 #content div.box-left div.form div.fields div.field div.input,#content div.box-right div.form div.fields div.field div.input {
 margin:0 0 0 0px;
+}
 #content div.box div.form div.fields div.field div.input input {
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
 padding:7px 7px 6px;
+}
 #content div.box div.form div.fields div.field div.file input {
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;
     border-style: solid;
     border-width: 1px;
     color: #000000;
     font-family: Lucida Grande,Verdana,Lucida Sans Regular,Lucida Sans Unicode,Arial,sans-serif;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #content div.box div.form div.fields div.field div.input input.small {
 width:30%;
+}
 #content div.box div.form div.fields div.field div.input input.medium {
 width:55%;
+}
 #content div.box div.form div.fields div.field div.input input.large {
 width:85%;
@@ @@ -2350,38 +2364,38 @@ padding:14px 10px; @@
 #content div.box div.title div.search {
 background:url("../images/title_link.png") no-repeat top left;
 border-left:1px solid #316293;
+}
 #content div.box div.title div.search div.input input {
 border:1px solid #316293;
+}
 input.ui-button-small {
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
 border-right:1px solid #DDD;
 border-bottom:1px solid #c6c6c6;
 color:#515151;
 outline:none;
 margin:0;
 -webkit-border-radius: 4px 4px 4px 4px;
 -khtml-border-radius: 4px 4px 4px 4px;
 -moz-border-radius: 4px 4px 4px 4px;
 border-radius: 4px 4px 4px 4px;
 box-shadow: 0 1px 0 #ececec;
 cursor: pointer;
 background:#e5e3e3 url("../images/button.png") repeat-x !important;
 border-top:1px solid #DDD !important;
 border-left:1px solid #c6c6c6 !important;
 border-right:1px solid #DDD !important;
 border-bottom:1px solid #c6c6c6 !important;
 color:#515151 !important;
 outline:none !important;
 margin:0 !important;
 -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;
 box-shadow: 0 1px 0 #ececec !important;
 cursor: pointer !important;
+}
 input.ui-button-small:hover {
 background:#b4b4b4 url("../images/button_selected.png") repeat-x;
 border-top:1px solid #ccc;
 border-left:1px solid #bebebe;
 border-right:1px solid #b1b1b1;
 border-bottom:1px solid #afafaf;
+}
 input.ui-button-small-blue {
 background:#4e85bb url("../images/button_highlight.png") repeat-x;

rhodecode/templates/files/files_add.html

➞

Show inline comments

@@ @@ -27,60 +27,85 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
               <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 		  ${h.form(h.url.current(),method='post',id='eform')}
+		  ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")}
             <h3>${_('Add new file')}</h3>
             <div class="form">
                     <div class="fields">
                          <div class="field">
                             <div class="label">
                                 <label for="location">${_('Location')}</label>
                             </div>
                             <div class="input">
                                 <input type="text" value="${c.f_path}" size="30" name="location" id="location">
                                 ${_('use / to separate directories')}
                             </div>
                          </div>
                         <div class="field">
+                        <div id="filename_container" class="field file">
                             <div class="label">
                                 <label for="filename">${_('File Name')}:</label>
                             </div>
                             <div class="input">
                                 <input type="text" value="" size="30" name="filename" id="filename">
                                 <input type="button" class="ui-button-small" value="upload file" id="upload_file_enable">
                             </div>
                         </div>
                         </div>
                         <div id="upload_file_container" class="field" style="display:none">
                           <div class="label">
                               <label for="location">${_('Upload file')}</label>
                           </div>
                           <div class="file">
                               <input type="file"  size="30" name="upload_file" id="upload_file">
                               <input type="button" class="ui-button-small" value="create file" id="file_enable">
                           </div>
                         </div>
                     </div>
             </div>
 			<div id="body" class="codeblock">
 			    <pre id="editor_pre"></pre>
 				<textarea id="editor" name="content" style="display:none"></textarea>
 			    <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%"></textarea>
+				<textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px"></textarea>
 			</div>
 			<div style="text-align: right;padding-top: 5px">
 			<input id="reset" type="button" value="${_('Reset')}" class="ui-button-small" />
 			${h.submit('commit',_('Commit changes'),class_="ui-button-small-blue")}
 			</div>
 			${h.end_form()}
 			<script type="text/javascript">
 			 var myCodeMirror = CodeMirror.fromTextArea(YUD.get('editor'),{
 	                mode:  "null",
 	                lineNumbers:true
 	              });
 			 YUE.on('reset','click',function(){
+			 YUE.on('reset','click',function(e){
 				 window.location="${h.url('files_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path)}";
 			 })
 			 });
 			 YUE.on('file_enable','click',function(){
                  YUD.setStyle('editor_container','display','');
                  YUD.setStyle('upload_file_container','display','none');
                  YUD.setStyle('filename_container','display','');
              });
 			 YUE.on('upload_file_enable','click',function(){
 				 YUD.setStyle('editor_container','display','none');
 				 YUD.setStyle('upload_file_container','display','');
 				 YUD.setStyle('filename_container','display','none');
 			 });
 			</script>
 		</div>
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@

rhodecode/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -33,25 +33,25 @@ @@
               <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table">
 		<div id="files_data">
 			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3>
 			${h.form(h.url.current(),method='post',id='eform')}
 			<div id="body" class="codeblock">
 			    <pre id="editor_pre"></pre>
 				<textarea id="editor" name="content" style="display:none">${c.file.content|n}</textarea>
 				<div style="padding: 10px;color:#666666">${_('commit message')}</div>
-				<textarea id="commit" name="message" style="height: 100px;width: 99%"></textarea>
+				<textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px"></textarea>
 			</div>
 			<div style="text-align: right;padding-top: 5px">
 			<input id="reset" type="button" value="${_('Reset')}" class="ui-button-small" />
 			${h.submit('commit',_('Commit changes'),class_="ui-button-small-blue")}
 			</div>
 			${h.end_form()}
 			<script type="text/javascript">
 			 var myCodeMirror = CodeMirror.fromTextArea(YUD.get('editor'),{
 	                mode:  "null",
 	                lineNumbers:true
 	              });
 			 YUE.on('reset','click',function(){

0 comments (0 inline, 0 general)