Skip to content

Commit

Permalink
Fix to video approval
Browse files Browse the repository at this point in the history
  • Loading branch information
donker committed Jun 13, 2019
1 parent a6728ac commit 697954f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 22 deletions.
18 changes: 6 additions & 12 deletions Client/js/Resources/Video.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from "react";
import * as Models from "../Models/";
import StatusApprovalButton from "./StatusApprovalButton";

interface IVideoProps {
module: Models.IAppModule;
Expand Down Expand Up @@ -65,18 +66,11 @@ export default class Video extends React.Component<IVideoProps, IVideoState> {
</td>
) : null;
var okCol = this.props.module.security.CanManage ? (
<td className="iconCol">
<a
href="#"
onClick={e => {
e.preventDefault();
this.props.approveResource(this.props.resource);
}}
title={this.props.module.resources.Approve}
>
<span className="btn btn-sm btn-success glyphicon glyphicon-check" />
</a>
</td>
<StatusApprovalButton
module={this.props.module}
resource={this.props.resource}
approveResource={r => this.props.approveResource(r)}
/>
) : (
<td className="iconCol" />
);
Expand Down
4 changes: 2 additions & 2 deletions Server/Conference/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.3.7")]
[assembly: AssemblyFileVersion("2.3.7")]
[assembly: AssemblyVersion("2.3.8")]
[assembly: AssemblyFileVersion("2.3.8")]
[assembly: AssemblyInformationalVersion("01.00.00")]
10 changes: 5 additions & 5 deletions Server/Conference/js/Conference.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Server/Connect.Conference.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("2.2.12")]
[assembly: AssemblyVersion("2.3.7")]
[assembly: AssemblyFileVersion("2.3.7")]
[assembly: AssemblyVersion("2.3.8")]
[assembly: AssemblyFileVersion("2.3.8")]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "conference",
"version": "2.3.8",
"version": "2.3.9",
"description": "Conference module",
"dnn": {
"projectFolders": [
Expand Down

0 comments on commit 697954f

Please sign in to comment.