Skip to content

Commit

Permalink
git subrepo pull uno
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "uno"
  merged:   "418c2d3"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "418c2d3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
  • Loading branch information
prrvchr committed Dec 31, 2023
1 parent c7fec34 commit b7b8eef
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 64dce88dad3da28831d782d966c97fb364110ab2
parent = 58a17103261eecfe2f27f702a4f34b7bae98b33f
commit = 418c2d3118d4a8c7892eb02627f595d0b7b3a944
parent = c7fec34b83780491ea6830da08eaef519a52d69b
method = merge
cmdver = 0.4.3
2 changes: 1 addition & 1 deletion uno/lib/uno/ucb/ucp/content.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def queryCreatableContentsInfo(self):
return self._getCreatableContentsInfo()
def createNewContent(self, info):
self._logger.logprb(INFO, 'Content', 'createNewContent()', 661, self._identifier)
return self._user.createNewContent(self._authority, self.Id, self.Path, self.Title, info.Type)
return self._user.createNewContent(self._authority, self.Id, self.Path, self.Title, self.Link, info.Type)

# XContent
def getIdentifier(self):
Expand Down
8 changes: 4 additions & 4 deletions uno/lib/uno/ucb/ucp/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ def getContentIdentifier(self, authority, itemid, path, title):
identifier += g_separator
return identifier

def createNewContent(self, authority, parentid, path, title, contentype):
data = self._getNewContent(parentid, path, title, contentype)
def createNewContent(self, authority, parentid, path, title, link, contentype):
data = self._getNewContent(parentid, path, title, link, contentype)
content = Content(self._ctx, self, authority, data, True)
return content

Expand Down Expand Up @@ -282,7 +282,7 @@ def _getUriFactory(self):
self._factory = getUriFactory(self._ctx)
return self._factory

def _getNewContent(self, parentid, path, title, contentype):
def _getNewContent(self, parentid, path, title, link, contentype):
timestamp = currentUnoDateTime()
isfolder = self.Provider.isFolder(contentype)
isdocument = self.Provider.isDocument(contentype)
Expand All @@ -309,7 +309,7 @@ def _getNewContent(self, parentid, path, title, contentype):
'TitleOnServer': '',
'Id': itemid,
'Path': self._getPath(parentid, path, title),
'Link': '',
'Link': link,
'Trashed': False,
'IsRoot': False,
'IsLink': False,
Expand Down

0 comments on commit b7b8eef

Please sign in to comment.