Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-16 18:26:16 +01:00
Code Issues Packages Projects Releases Activity

Merged 2.0.0-m3

Browse Source
This commit is contained in:
Philipp Czora
2019-02-26 11:05:17 +01:00
parent 264eca4b49 fbb0d2cf34
commit 3b410ab8c3
6 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-hg-plugin/src/main/resources/sonia/scm/python/scmhooks.py
View File

@@ -98,10 +98,6 @@ def callback(ui, repo, hooktype, node=None):
return abort
def preHook(ui, repo, hooktype, node=None, source=None, pending=None, **kwargs):
log_file = open("/tmp/hg_callback.log", "a")
log_file.write("in callHookUrl\n")
log_file.close()
# older mercurial versions
if pending != None:
pending()

20
scm-ui/src/groups/containers/Groups.js
View File

@@ -78,13 +78,6 @@ class Groups extends React.Component<Props> {
<GroupTable groups={groups} />
{this.renderPaginator()}
{this.renderCreateButton()}
<PageActions>
<Button
label={t("create-group-button.label")}
link="/groups/add"
color="primary"
/>
</PageActions>
</Page>
);
}
@@ -99,7 +92,18 @@ class Groups extends React.Component<Props> {
renderCreateButton() {
if (this.props.canAddGroups) {
return <CreateGroupButton />;
return (
<>
<CreateGroupButton />
<PageActions>
<Button
label={this.props.t("create-group-button.label")}
link="/groups/add"
color="primary"
/>
</PageActions>
</>
);
} else {
return;
}

21
scm-ui/src/repos/containers/Overview.js
View File

@@ -73,13 +73,6 @@ class Overview extends React.Component<Props> {
error={error}
>
{this.renderList()}
<PageActions>
<Button
label={t("overview.createButton")}
link="/repos/create"
color="primary"
/>
</PageActions>
</Page>
);
}
@@ -102,7 +95,19 @@ class Overview extends React.Component<Props> {
const { showCreateButton, t } = this.props;
if (showCreateButton) {
return (
<CreateButton label={t("overview.createButton")} link="/repos/create" />
<>
<CreateButton
label={t("overview.createButton")}
link="/repos/create"
/>
<PageActions>
<Button
label={t("overview.createButton")}
link="/repos/create"
color="primary"
/>
</PageActions>
</>
);
}
return null;

20
scm-ui/src/users/containers/Users.js
View File

@@ -78,13 +78,6 @@ class Users extends React.Component<Props> {
<UserTable users={users} />
{this.renderPaginator()}
{this.renderCreateButton()}
<PageActions>
<Button
label={t("users.createButton")}
link="/users/add"
color="primary"
/>
</PageActions>
</Page>
);
}
@@ -100,7 +93,18 @@ class Users extends React.Component<Props> {
renderCreateButton() {
const { t } = this.props;
if (this.props.canAddUsers) {
return <CreateButton label={t("users.createButton")} link="/users/add" />;
return (
<>
<CreateButton label={t("users.createButton")} link="/users/add" />
<PageActions>
<Button
label={t("users.createButton")}
link="/users/add"
color="primary"
/>
</PageActions>
</>
);
} else {
return;
}

6
scm-webapp/src/main/resources/locales/de/plugins.json
View File

@@ -55,15 +55,15 @@
"verbs": {
"repository": {
"read": {
"displayName": "Lesen",
"displayName": "Repository Lesen",
"description": "Darf das Repository im SCM-Manager sehen."
},
"modify": {
"displayName": "Modifizieren",
"displayName": "Repository Modifizieren",
"description": "Darf die Eigenschaften des Repository verändern."
},
"delete": {
"displayName": "Löschen",
"displayName": "Repository Löschen",
"description": "Darf das Repository löschen."
},
"pull": {

14
scm-webapp/src/main/resources/locales/en/plugins.json
View File

@@ -55,23 +55,23 @@
"verbs": {
"repository": {
"read": {
"displayName": "read",
"displayName": "read repository",
"description": "May see the repository inside the SCM-Manager"
},
"modify": {
"displayName": "modify",
"description": "May modify the properties of the repository"
"displayName": "modify repository metadata",
"description": "May modify the basic properties of the repository"
},
"delete": {
"displayName": "delete",
"displayName": "delete repository",
"description": "May delete the repository"
},
"pull": {
"displayName": "pull/checkout",
"displayName": "pull/checkout repository",
"description": "May pull/checkout the repository"
},
"push": {
"displayName": "push/commit",
"displayName": "push/commit repository",
"description": "May change the content of the repository (push/commit)"
},
"permissionRead": {
@@ -83,7 +83,7 @@
"description": "May modify the permissions of the repository"
},
"*": {
"displayName": "overall",
"displayName": "own repository",
"description": "May change everything for the repository (includes all other permissions)"
}
}