alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

groups version 2.0

This commit is contained in:
Harry Bomrah 2015-04-28 22:24:25 +08:00
parent 804030751f
commit ae785defc2
9 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/groups_controller.rb
View File

@ -124,14 +124,14 @@ class Admin::GroupsController < OrbitGroupController
if !gpi.nil?
images << gpi
end
end
end if !p[:group_post_images].nil?
files = []
p[:group_post_files].each do |id|
gpf = GroupPostFile.find(id) rescue nil
if !gpf.nil?
files << gpf
end
end
end if !p[:group_post_files].nil?
p[:group_post_images] = images
p[:group_post_files] = files
p
@ -147,6 +147,7 @@ class Admin::GroupsController < OrbitGroupController
def group_params
p = params.require(:group).permit!
p["user_ids"] = [] if p["user_ids"].nil?
p["user_ids"] << current_user.id.to_s
p["admins"] = []
p["admins"] << current_user.id.to_s

2
app/controllers/orbit_group_controller.rb
View File

@ -19,7 +19,7 @@ class OrbitGroupController < ApplicationController
def set_access_rights
@access_right_level = "none"
read_or_write = "write"
read_or_write = @group.permission rescue "read"
case params[:action]
when "show", "showpost", "newpost"
is_member = @group.users.include?(current_user)

1
app/models/group.rb
View File

@ -7,6 +7,7 @@ class Group
field :description, localize: true
field :admins, type: Array, default: []
field :privacy, default: "closed"
field :permission, default: "write"
field :archive, type: Boolean, default: false
mount_uploader :image, ImageUploader

4
app/views/admin/groups/_group.html.erb
View File

@ -38,7 +38,9 @@
<span class="label <%= group.privacy == 'closed' ? "label-important" : "label-success" %>"><%= group.privacy %></span>
</li>
<li>
<%= group.description %>
<% content = group.description %>
<%= content[0..250] %>
<%= "..." if content.length > 250 %>
</li>
</ul>
</div>

10
app/views/admin/groups/_group_form.html.erb
View File

@ -59,7 +59,7 @@
</div>
</div>
<!-- privacy settings -->
<div class="control-group">
<div class="control-group" id="privacy_box">
<label class="control-label muted">Privacy</label>
<div class="controls">
<label class="radio inline">
@ -70,17 +70,17 @@
</label>
</div>
</div>
<div class="control-group">
<div class="control-group" id="permission_box">
<label class="control-label muted">Permission</label>
<div class="controls">
<label class="radio inline">
<input type="radio" name="group[privacy]" value="open" /> Read
<input type="radio" name="group[permission]" value="read" /> Read
</label>
<label class="radio inline">
<input type="radio" name="group[privacy]" value="closed" checked="checked" /> Write
<input type="radio" name="group[permission]" value="write" checked="checked" /> Write
</label>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label muted"><%= t(:members) %></label>
<div class="controls">

8
app/views/admin/groups/_post.html.erb
View File

@ -28,19 +28,19 @@
</span>
<div class="group-page-post-sub-wrap">
<span class="group-page-post-postdate">
<% date = DateTime.parse(post.created_at.to_s).strftime("%d %B") %>
<% date = DateTime.parse(post.created_at.to_s).strftime("%d %B %H:%M") %>
<i class="group-page-post-postdate-icon icon-time"></i> <%= date %>
</span>
<span class="group-post-time">10:25</span>
<!-- <span class="group-post-time">10:25</span> -->
</div>
<div class="group-page-seen-by tool-tip-parent">
<!-- <div class="group-page-seen-by tool-tip-parent">
<i class="fa fa-eye"></i>
<em class="group-page-seen-by-lead">Seen by: </em>
<div class="gorup-post-seen-by-names tool-tip right">
<span class="group-page-seen-by-name">Harry</span>
<span class="group-page-seen-by-name">Ika</span>
</div>
</div>
</div> -->
</div>
</div>
</div>

15
app/views/admin/groups/newpost.html.erb
View File

@ -51,7 +51,11 @@
if(filesCount > 0){
doImagesUpload();
}else{
doFilesUpload();
if(groupFilesDropzone.getQueuedFiles().length > 0){
doFilesUpload();
}else{
submitForm();
}
}
});
}
@ -106,7 +110,13 @@
}
$("#create-post-form-btn").on("click",function(){
doImagesUpload();
if(groupImageDropzone.getQueuedFiles().length > 0){
doImagesUpload();
}else if(groupFilesDropzone.getQueuedFiles().length > 0){
doFilesUpload();
}else{
submitForm();
}
// uploading all the files
$(".upload-status-notice")
.removeClass("hide")
@ -118,6 +128,7 @@
if(groupImageDropzone.getQueuedFiles().length > 0 || groupFilesDropzone.getQueuedFiles().length > 0){
return false;
}else{
$(".upload-status-notice span.upload-text").text("Submitting");
$("form#new_group_post").submit();
return true;
}

4
app/views/admin/groups/show.html.erb
View File

@ -37,8 +37,8 @@
<div class="group-page-section">
<div class="group-page-detail">
<ul class="group-page-pagenation breadcrumb">
<li><a href="#">Home</a> <span class="divider">/</span></li>
<li class="active">Another teacher group</li>
<li><a href="<%= admin_groups_path %>">My Groups</a> <span class="divider">/</span></li>
<li class="active"><%= @group.title %></li>
</ul>
<span class="gorup-page-info-wrap button button-default" id="group_info_button">
<i class="group-page-info-icon icon-info-sign"></i> <span>Info</span>

9
app/views/admin/groups/showpost.html.erb
View File

@ -12,8 +12,9 @@
<article class="group-post">
<ul class="group-page-pagenation breadcrumb">
<li><a href="#">Home</a> <span class="divider">/</span></li>
<li class="active">Another teacher group</li>
<li><a href="<%= admin_groups_path %>">My Groups</a> <span class="divider">/</span></li>
<li><a href="<%= admin_group_path(@group) %>"><%= @group.title %></a> <span class="divider">/</span></li>
<li class="active"><%= @post.title %></li>
</ul>
<header class="group-post-meta">
<div class="group-post-heading-wrap clearfix">
@ -35,10 +36,10 @@
<div class="group-post-sub-wrap">
<span class="group-post-postdate">
<% date = DateTime.parse(@post.created_at.to_s).strftime("%d %B") %>
<% date = DateTime.parse(@post.created_at.to_s).strftime("%d %B %H:%M ") %>
<i class="group-post-postdate-icon icon-time"></i> <%= date %>
</span>
<span class="group-post-time">10:25</span>
<!-- <span class="group-post-time">10:25</span> -->
</div>
</header>
<section class="group-post-image-wrap">