Matthew K. Fu JuYuan
e16a27601d
user new interface 70%
2012-10-08 16:58:33 +08:00
Matthew K. Fu JuYuan
5de433d219
user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
...
Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-09-18 16:22:56 +08:00
Matthew K. Fu JuYuan
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
Matthew K. Fu JuYuan
5fb94f644d
break down Ray's HTML
2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan
4818e3f444
first version for new member html
2012-09-14 00:02:21 +08:00
Harry Bomrah
04877b9945
design update
2012-09-12 01:58:23 +08:00
chris
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou
a6a8fe3d64
Remove remaining 18n_variables
2012-07-27 19:37:25 +08:00
Christophe Vilayphiou
53cae0a9ee
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
Christophe Vilayphiou
49dd3a1770
Remove i18n_variable for controllers, helpers and models
2012-07-27 19:13:39 +08:00
Matthew K. Fu JuYuan
d0632b2e4c
change name format
2012-07-03 16:05:19 +08:00
Harry Bomrah
bacb1f1e63
Timeline ajax loading
2012-07-02 21:06:36 +08:00
Christophe Vilayphiou
a1e74987dc
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
...
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Matthew K. Fu JuYuan
ffd95ee1fd
fix
...
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan
1f1868a75f
cache privilege user list.
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
Matt
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
Christophe Vilayphiou
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan
9ba4c2cf2f
Change to apply page to had object_auth
2012-05-14 12:40:50 +08:00
Harry Bomrah
2c3637e9b4
very important update for widgets management..
2012-05-11 15:27:16 +08:00
Harry Bomrah
2083e0bf4f
widget structure improvised…
2012-05-07 19:00:50 +08:00
Harry Bomrah
a3a1e4b92e
controller change, views working and db for paper and journals
2012-05-03 21:30:12 +08:00
devin
a99d685bce
conflict solved
2012-04-28 01:56:00 +08:00
devin
03f19b80b4
small change
2012-04-28 01:49:48 +08:00
Harry Bomrah
a23f290831
changes for login …
2012-04-27 22:14:44 +08:00
Harry Bomrah
c158375d02
with connection and some save settings…
2012-04-26 21:30:13 +08:00
Harry Bomrah
f5c080efd4
Model commit
2012-04-06 17:47:04 +08:00
Matt Fu
9a40ecd1d9
Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
...
Conflicts:
app/views/devise/passwords/new.html.erb
app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
Matt Fu
3209f9aa27
Complete for 229 check.
2012-02-24 19:07:47 +08:00
Christophe Vilayphiou
dcc64a20d2
Finish sorting for announcements
2012-02-24 15:30:49 +08:00
Matt Fu
678f1eabef
LDAP connection and modified Devise
2012-02-22 14:43:24 +08:00
Christophe Vilayphiou
6a196c5d3d
Embedded to referenced for users
2012-01-24 15:12:06 +08:00
Matthew Fu
18a82d7f47
Manger and SubManager
2012-01-24 12:28:32 +08:00
Christophe Vilayphiou
bfd55277d7
Embed attribute_fields and sub_roles
2012-01-24 11:57:27 +08:00
Matthew Fu
7b40706aed
fixing for app_auth
2012-01-05 16:20:51 +08:00
chris2tof
a09f8e4551
merge with november_presentation
2011-12-20 16:47:17 +08:00
chris2tof
afbffe37d5
Users can now be saved with sub_roles
2011-12-20 14:35:28 +08:00
chris2tof
4108ebf06d
Fix mongoid deeply nested polimorphic
...
Got the commit from github. The roles and sub_roles save.
2011-12-19 21:22:26 +08:00
chris2tof
d27d7a623c
Changes for sub_roles
...
Issues: update doesn't create new i18n_variables, role form has bugs
2011-12-18 10:07:42 +08:00
chris2tof
b7ac5478b4
Change role structure
...
Still needs to: change the views and create sub_roles in the dev.rake
2011-12-10 18:12:39 +08:00
chris2tof
66bc0ce560
Modified dev.rake
2011-11-20 03:16:35 +08:00
chris2tof
ad9f9bbf5c
Final Ray's modifications
2011-11-19 21:47:18 +08:00
chris2tof
65349796d0
Ray's modifications
2011-11-18 16:43:14 +08:00
chris2tof
861237d65b
Integration of Ray' modifications
2011-11-17 20:02:58 +08:00
chris2tof
d9d7099da6
Fix bug: users can now be saved
2011-11-12 17:54:45 +08:00
chris2tof
86443661e9
Merge server and rails_3_1
2011-08-18 13:43:33 +08:00